summaryrefslogtreecommitdiff
path: root/www/firefox36
diff options
context:
space:
mode:
authorAlan Eldridge <alane@FreeBSD.org>2002-10-22 11:04:48 +0000
committerAlan Eldridge <alane@FreeBSD.org>2002-10-22 11:04:48 +0000
commitae9a16bd21e0d985db551ba582298e34b59a3272 (patch)
tree785d6aac72e5bf77e5d2e0c115d61afce3650b7e /www/firefox36
parentFile moved from freesoftware.fsf.org to savannah.nongnu.org. (diff)
1. Respect CFLAGS.
2. Set appropriate compile/link options for threading.
Notes
Notes: svn path=/head/; revision=68587
Diffstat (limited to 'www/firefox36')
-rw-r--r--www/firefox36/Makefile7
-rw-r--r--www/firefox36/files/mozconfig.in4
2 files changed, 8 insertions, 3 deletions
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index a197d83f1ecb..ce27e02cae11 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -31,7 +31,8 @@ USE_BZIP2= yes
USE_GMAKE= yes
#USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
-
+CFLAGS+= ${PTHREAD_CFLAGS}
+LIBS+= ${PTHREAD_LIBS}
WRKSRC= ${WRKDIR}/mozilla
.include <bsd.port.pre.mk>
@@ -41,7 +42,9 @@ WRKSRC= ${WRKDIR}/mozilla
.endif
post-extract:
- ${SED} -e 's|@X11BASE@|${X11BASE}|' \
+ ${SED} -e 's|@CFLAGS@|${CFLAGS}|' \
+ -e 's|@LIBS@|${LIBS}|' \
+ -e 's|@X11BASE@|${X11BASE}|' \
-e 's|@LOCALBASE@|${LOCALBASE}|' \
<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in
index f923e6f239b5..cbc4ac979bd5 100644
--- a/www/firefox36/files/mozconfig.in
+++ b/www/firefox36/files/mozconfig.in
@@ -9,9 +9,11 @@ ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-mailnews
ac_add_options --disable-composer
-ac_add_options --enable-optimize=-O2
+#ac_add_options --enable-optimize=-O2
######################################################################
# FBSD specific
+export CFLAGS=@CFLAGS@
+export LIBS=@LIBS@
export PERL=@LOCALBASE@/bin/perl5.8.0
mk_add_options PERL=$PERL
export GTK_CONFIG=@X11BASE@/bin/gtk12-config