[SVN-Commit] r848 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-esr www/firefox www/firefox-esr www/firefox-nightly www/libxul www/seamonkey

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Fri Jul 6 16:34:05 UTC 2012


Author: jbeich
Date: Fri Jul  6 16:33:59 2012
New Revision: 848

Log:
followup to r819: move -lcxxrt to bsd.gecko.mk

gecko <= 1.9 with clang/libc++ is still unsupported (fails to build)

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/mail/thunderbird-esr/Makefile
   branches/experimental/mail/thunderbird/Makefile
   branches/experimental/www/firefox-esr/Makefile
   branches/experimental/www/firefox-nightly/Makefile
   branches/experimental/www/firefox/Makefile
   branches/experimental/www/libxul/Makefile
   branches/experimental/www/seamonkey/Makefile

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Fri Jul  6 16:33:47 2012	(r847)
+++ branches/experimental/Mk/bsd.gecko.mk	Fri Jul  6 16:33:59 2012	(r848)
@@ -655,6 +655,10 @@
 MOZ_MK_OPTIONS+=	XP_UNIX=1		\
 			PERL=${PERL}
 
+.if ${CXXFLAGS:M-stdlib=libc++}
+LIBS+=		-lcxxrt
+.endif
+
 .if ${MOZ_TOOLKIT:Mcairo-qt}
 USE_GNOME+=	pango
 USE_QT4+=	moc_build gui network opengl

Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile	Fri Jul  6 16:33:47 2012	(r847)
+++ branches/experimental/mail/thunderbird-esr/Makefile	Fri Jul  6 16:33:59 2012	(r848)
@@ -90,10 +90,6 @@
 CFLAGS+=	-Wno-return-type-c-linkage
 .endif
 
-.if ${CXXFLAGS:M-stdlib=libc++}
-LIBS+=		-lcxxrt
-.endif
-
 .if ${PORT_OPTIONS:MLIGHTNING}
 MOZ_OPTIONS+=	--enable-calendar
 MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=calendar

Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile	Fri Jul  6 16:33:47 2012	(r847)
+++ branches/experimental/mail/thunderbird/Makefile	Fri Jul  6 16:33:59 2012	(r848)
@@ -90,10 +90,6 @@
 CFLAGS+=	-Wno-return-type-c-linkage
 .endif
 
-.if ${CXXFLAGS:M-stdlib=libc++}
-LIBS+=		-lcxxrt
-.endif
-
 .if ${PORT_OPTIONS:MLIGHTNING}
 MOZ_OPTIONS+=	--enable-calendar
 MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=calendar

Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile	Fri Jul  6 16:33:47 2012	(r847)
+++ branches/experimental/www/firefox-esr/Makefile	Fri Jul  6 16:33:59 2012	(r848)
@@ -100,10 +100,6 @@
 CXXFLAGS+=	-Wno-return-type-c-linkage
 .endif
 
-.if ${CXXFLAGS:M-stdlib=libc++}
-LIBS+=		-lcxxrt
-.endif
-
 pre-extract:
 .if ${PORT_OPTIONS:MPGO}
 	@${ECHO} "*****************************************************************"

Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile	Fri Jul  6 16:33:47 2012	(r847)
+++ branches/experimental/www/firefox-nightly/Makefile	Fri Jul  6 16:33:59 2012	(r848)
@@ -117,10 +117,6 @@
 BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
 .endif
 
-.if ${CXXFLAGS:M-stdlib=libc++}
-LIBS+=		-lcxxrt
-.endif
-
 pre-extract:
 .if ${PORT_OPTIONS:MPGO}
 	@${ECHO} "*****************************************************************"

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Fri Jul  6 16:33:47 2012	(r847)
+++ branches/experimental/www/firefox/Makefile	Fri Jul  6 16:33:59 2012	(r848)
@@ -96,10 +96,6 @@
 BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
 .endif
 
-.if ${CXXFLAGS:M-stdlib=libc++}
-LIBS+=		-lcxxrt
-.endif
-
 pre-extract:
 .if ${PORT_OPTIONS:MPGO}
 	@${ECHO} "*****************************************************************"

Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile	Fri Jul  6 16:33:47 2012	(r847)
+++ branches/experimental/www/libxul/Makefile	Fri Jul  6 16:33:59 2012	(r848)
@@ -77,10 +77,6 @@
 CXXFLAGS+=	-Wno-return-type-c-linkage
 .endif
 
-.if ${CXXFLAGS:M-stdlib=libc++}
-LIBS+=		-lcxxrt
-.endif
-
 post-patch:
 	@${GREP} -Flr \"/proc ${WRKSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|/proc/self/fd|/dev/fd|' \

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile	Fri Jul  6 16:33:47 2012	(r847)
+++ branches/experimental/www/seamonkey/Makefile	Fri Jul  6 16:33:59 2012	(r848)
@@ -112,10 +112,6 @@
 CFLAGS+=	-Wno-return-type-c-linkage
 .endif
 
-.if ${CXXFLAGS:M-stdlib=libc++}
-LIBS+=		-lcxxrt
-.endif
-
 .if ${PORT_OPTIONS:MLIGHTNING}
 MOZ_OPTIONS+=	--enable-calendar
 MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=calendar


More information about the freebsd-gecko mailing list