Date: Mon, 8 Nov 2010 14:27:48 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r432 - branches/experimental/Mk branches/experimental/www/firefox-devel branches/experimental/www/firefox-devel/files trunk/Mk Message-ID: <201011081427.oA8ERmEA014653@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Mon Nov 8 14:27:48 2010
New Revision: 432
Log:
- Fix build with recent gcc versions
Submitted by: Anonymous <swell.k AT gmail.com>
Added:
branches/experimental/www/firefox-devel/files/patch-js-src-jsnativestack.cpp
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/www/firefox-devel/Makefile
branches/experimental/www/firefox-devel/files/patch-js-src-Makefile.in
branches/experimental/www/firefox-devel/files/patch-toolkit_library_Makefile.in
trunk/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Sun Nov 7 13:07:39 2010 (r431)
+++ branches/experimental/Mk/bsd.gecko.mk Mon Nov 8 14:27:48 2010 (r432)
@@ -623,6 +623,7 @@
.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' \
Modified: branches/experimental/www/firefox-devel/Makefile
==============================================================================
--- branches/experimental/www/firefox-devel/Makefile Sun Nov 7 13:07:39 2010 (r431)
+++ branches/experimental/www/firefox-devel/Makefile Mon Nov 8 14:27:48 2010 (r432)
@@ -113,6 +113,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 \
Modified: branches/experimental/www/firefox-devel/files/patch-js-src-Makefile.in
==============================================================================
--- branches/experimental/www/firefox-devel/files/patch-js-src-Makefile.in Sun Nov 7 13:07:39 2010 (r431)
+++ branches/experimental/www/firefox-devel/files/patch-js-src-Makefile.in Mon Nov 8 14:27:48 2010 (r432)
@@ -1,9 +1,10 @@
--- js/src/Makefile.in.orig 2009-05-11 15:21:19.000000000 +0200
+++ js/src/Makefile.in 2009-05-11 15:21:34.000000000 +0200
-@@ -427,7 +427,7 @@
+@@ -427,7 +427,8 @@
endif # WINNT
ifeq ($(OS_ARCH),FreeBSD)
++DEFINES += -DFREEBSD
-EXTRA_LIBS += -pthread
+EXTRA_LIBS += -pthread -lc
endif
Added: branches/experimental/www/firefox-devel/files/patch-js-src-jsnativestack.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-devel/files/patch-js-src-jsnativestack.cpp Mon Nov 8 14:27:48 2010 (r432)
@@ -0,0 +1,12 @@
+--- 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__)
++# if defined(FREEBSD)
++# include <cstddef>
+ # include <pthread_np.h>
+ # endif
+
Modified: branches/experimental/www/firefox-devel/files/patch-toolkit_library_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-devel/files/patch-toolkit_library_Makefile.in Sun Nov 7 13:07:39 2010 (r431)
+++ branches/experimental/www/firefox-devel/files/patch-toolkit_library_Makefile.in Mon Nov 8 14:27:48 2010 (r432)
@@ -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
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Sun Nov 7 13:07:39 2010 (r431)
+++ trunk/Mk/bsd.gecko.mk Mon Nov 8 14:27:48 2010 (r432)
@@ -516,6 +516,7 @@
.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' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011081427.oA8ERmEA014653>