From c274837f69a818c635a505eefee161f441d1f2c6 Mon Sep 17 00:00:00 2001
From: beat <beat@FreeBSD.org>
Date: Tue, 23 Nov 2010 15:34:52 +0000
Subject: - Respect STRIP to allow for debugging builds [1] - Fix build of
 upcoming Firefox 4 with recent gcc versions [2]

PR:		ports/152043 [1]
Submitted by:	Anonymous <swell.k AT gmail.com> [1,2]
---
 Mk/bsd.gecko.mk | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Mk/bsd.gecko.mk')

diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index ca56af41b423..49a417840402 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -418,14 +418,16 @@ MOZ_OPTIONS+=	--enable-gnomevfs
 MOZ_OPTIONS+=	--disable-gnomevfs
 .endif
 
+.if !defined(STRIP) || ${STRIP} == ""
+MOZ_OPTIONS+=	--disable-strip --disable-install-strip
+.endif
+
 .if defined(WITH_DEBUG)
-MOZ_OPTIONS+=	--enable-debug				\
-		--disable-strip
+MOZ_OPTIONS+=	--enable-debug
 WITH_LOGGING=	yes
 .else
 MOZ_OPTIONS+=	--disable-debug				\
-		--enable-optimize=${WITH_OPTIMIZE}	\
-		--enable-strip
+		--enable-optimize=${WITH_OPTIMIZE}
 .endif
 
 .if defined(WITH_JAVA) && defined(_WITH_JAVA)
@@ -516,6 +518,7 @@ gecko-post-patch:
 .for subdir in "" nsprpub js/src
 	@if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \
 		${ECHO_CMD} "fenv.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
+		${ECHO_CMD} "pthread_np.h" >> ${MOZSRC}/${subdir}/config/system-headers ; \
 	fi
 .endfor
 	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
-- 
cgit