diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-02-04 09:41:08 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-02-04 09:41:08 +0800 |
| commit | 929c154f06f18d168c01fa6865c1a89a25e73513 (patch) | |
| tree | 51cb7519ed799dea6df7a38f0b8c4870f2b56e54 | |
| parent | 5e17a491bd7edf6dedb3e15a699435c6a4b469b5 (diff) | |
| download | marcuscom-ports-929c154f06f18d168c01fa6865c1a89a25e73513.tar marcuscom-ports-929c154f06f18d168c01fa6865c1a89a25e73513.tar.gz marcuscom-ports-929c154f06f18d168c01fa6865c1a89a25e73513.tar.bz2 marcuscom-ports-929c154f06f18d168c01fa6865c1a89a25e73513.tar.lz marcuscom-ports-929c154f06f18d168c01fa6865c1a89a25e73513.tar.xz marcuscom-ports-929c154f06f18d168c01fa6865c1a89a25e73513.tar.zst marcuscom-ports-929c154f06f18d168c01fa6865c1a89a25e73513.zip | |
Merge objformat fixes from FreeBSD.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8284 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | www/mozilla/Makefile.common | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 701744f74..9f64f93b9 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -4,7 +4,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile.common,v 1.41 2007/01/14 07:06:34 marcus Exp $ +# $MCom: ports/www/mozilla/Makefile.common,v 1.42 2007/01/14 08:25:35 marcus Exp $ # This file contains some reusable components for mozilla ports. It's of # use primarily to apps from the mozilla project itself (such as Firefox, @@ -281,11 +281,16 @@ gecko-post-patch: ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ ${WRKSRC}/config/autoconf.mk.in - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ + @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \ + s|echo aout|echo elf|g' \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in + @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ + ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ + ${WRKSRC}/directory/c-sdk/configure @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g ; \ + s|echo aout|echo elf|g ; \ s|/usr/X11R6|${X11BASE}|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ |