diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-17 15:00:00 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-17 15:00:00 +0800 |
| commit | 9739875bd303fa29e22e5f14c887eb5eb4ebddf8 (patch) | |
| tree | 2af396c319fada903f94c3ac3636564674397426 /www | |
| parent | 310510f19ec4f8894496d2a2b4b54b667c311822 (diff) | |
| download | marcuscom-ports-9739875bd303fa29e22e5f14c887eb5eb4ebddf8.tar marcuscom-ports-9739875bd303fa29e22e5f14c887eb5eb4ebddf8.tar.gz marcuscom-ports-9739875bd303fa29e22e5f14c887eb5eb4ebddf8.tar.bz2 marcuscom-ports-9739875bd303fa29e22e5f14c887eb5eb4ebddf8.tar.lz marcuscom-ports-9739875bd303fa29e22e5f14c887eb5eb4ebddf8.tar.xz marcuscom-ports-9739875bd303fa29e22e5f14c887eb5eb4ebddf8.tar.zst marcuscom-ports-9739875bd303fa29e22e5f14c887eb5eb4ebddf8.zip | |
Add an rpath to Firefox binaries so we no longer need to do magical
LD_LIBRARY_PATH incanations to get applications to run with Firefox.
This fixes the Epiphany build, and was adapted from PR 89052.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5154 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox/Makefile | 9 | ||||
| -rw-r--r-- | www/firefox10/Makefile | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 3a5f4a348..d9a10095f 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,12 +3,12 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.15 2005/11/14 20:03:15 ahze Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.16 2005/11/16 00:08:29 marcus Exp $ # PORTNAME= firefox DISTVERSION= 1.5rc2 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -32,6 +32,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_GCC= 3.4+ +LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${FF} FIREFOX= ${MOZILLA} FF_SUFX= # -devel @@ -105,6 +106,10 @@ post-patch: ${WRKSRC}/${ii}/all.js .endfor +post-build: + @${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${FF}\2|" \ + ${WRKSRC}/build/unix/*.pc + pre-install: @${RM} -rf ${FAKEDIR} ${PLIST} @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile index 3a5f4a348..d9a10095f 100644 --- a/www/firefox10/Makefile +++ b/www/firefox10/Makefile @@ -3,12 +3,12 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.15 2005/11/14 20:03:15 ahze Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.16 2005/11/16 00:08:29 marcus Exp $ # PORTNAME= firefox DISTVERSION= 1.5rc2 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -32,6 +32,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_GCC= 3.4+ +LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${FF} FIREFOX= ${MOZILLA} FF_SUFX= # -devel @@ -105,6 +106,10 @@ post-patch: ${WRKSRC}/${ii}/all.js .endfor +post-build: + @${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${FF}\2|" \ + ${WRKSRC}/build/unix/*.pc + pre-install: @${RM} -rf ${FAKEDIR} ${PLIST} @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ |