Date: Thu, 04 Nov 2010 23:18:40 +0300 From: Anonymous <swell.k@gmail.com> To: freebsd-gecko@freebsd.org Subject: Re: [SVN-Commit] r430 - in branches/experimental/www/firefox-devel: . files Message-ID: <86mxposuzj.fsf@gmail.com> References: <201011022113.oA2LD12f028438@trillian.chruetertee.ch>
next in thread | previous in thread | raw e-mail | index | archive | help
svn-freebsd-gecko@chruetertee.ch writes:
> Author: beat
> Date: Tue Nov 2 21:13:01 2010
> New Revision: 430
>
> Log:
[...]
> - Add patches from Firefox 3.6 to fix build with recent gcc versions. It
> still does not build with gcc44+.
Do you have tinderbox log? Try below diff, it's against snapshot, though.
%%
Index: Mk/bsd.gecko.mk
===================================================================
RCS file: /a/.cvsup/ports/Mk/bsd.gecko.mk,v
retrieving revision 1.22
diff -u -p -r1.22 bsd.gecko.mk
--- Mk/bsd.gecko.mk 29 Aug 2010 15:16:20 -0000 1.22
+++ Mk/bsd.gecko.mk 26 Oct 2010 09:41:48 -0000
@@ -516,6 +515,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' \
Index: www/firefox-devel/Makefile
===================================================================
--- www/firefox-devel/Makefile (revision 430)
+++ www/firefox-devel/Makefile (working copy)
@@ -61,8 +60,6 @@
WRKSRC:= ${WRKSRC}-central
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
-
.if ${HAVE_GNOME:Mlibgnomeui}!=""
USE_GNOME+= libgnomeui
MOZ_OPTIONS+= --enable-gnomeui
@@ -109,6 +106,7 @@
post-patch:
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
${WRKSRC}/storage/build/Makefile.in \
+ ${WRKSRC}/toolkit/library/Makefile.in \
${WRKSRC}/db/sqlite3/src/Makefile.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/security/manager/ssl/src/Makefile.in \
Index: www/firefox-devel/files/patch-js-src-jsnativestack.cpp
===================================================================
--- www/firefox-devel/files/patch-js-src-jsnativestack.cpp (revision 0)
+++ www/firefox-devel/files/patch-js-src-jsnativestack.cpp (revision 0)
@@ -0,0 +1,11 @@
+--- js/src/jsnativestack.cpp~
++++ js/src/jsnativestack.cpp
+@@ -50,7 +50,8 @@
+ #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
+ # include <pthread.h>
+
+ # if defined(__FreeBSD__)
++# include <cstddef>
+ # include <pthread_np.h>
+ # endif
+
Index: www/firefox-devel/files/patch-toolkit_library_Makefile.in
===================================================================
--- www/firefox-devel/files/patch-toolkit_library_Makefile.in (revision 430)
+++ www/firefox-devel/files/patch-toolkit_library_Makefile.in (working copy)
@@ -5,7 +5,7 @@
$(INSTALL) $^ .
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols -Wl,--as-needed $(LIBS_DIR) $(EXTRA_DSO_LIBS)
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) %%PTHREAD_LIBS%%
ifdef MOZ_ENABLE_LIBXUL
include $(srcdir)/libxul-rules.mk
%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86mxposuzj.fsf>