Date: Fri, 05 Nov 2010 17:11:59 +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: <86zktn272o.fsf@gmail.com> In-Reply-To: <86mxposuzj.fsf@gmail.com> (Anonymous's message of "Thu, 04 Nov 2010 23:18:40 %2B0300") References: <201011022113.oA2LD12f028438@trillian.chruetertee.ch> <86mxposuzj.fsf@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Anonymous <swell.k@gmail.com> writes: > 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. [...] > + # if defined(__FreeBSD__) > ++# include <cstddef> > + # include <pthread_np.h> > + # endif Oops, I guess it should be defined explicitly otherwise js-shell fails on linking. gmake[2]: Entering directory `/usr/ports/www/firefox-devel/work/mozilla-central/js/src/shell' g++45 -o js [...] ../libjs_static.a /usr/local/bin/ld: error: hidden symbol 'pthread_attr_get_np' is not defined locally --- before (readelf -a) +++ after (readelf -a) @@ -83,7 +83,7 @@ Relocation section '.rela.text' at offse Offset Info Type Sym. Value Sym. Name + Addend 000000000007 001100000004 R_X86_64_PLT32 0000000000000000 pthread_self - 4 000000000017 001200000004 R_X86_64_PLT32 0000000000000000 pthread_attr_init - 4 -000000000022 001300000002 R_X86_64_PC32 0000000000000000 pthread_attr_get_np - 4 +000000000022 001300000004 R_X86_64_PLT32 0000000000000000 pthread_attr_get_np - 4 000000000046 001400000004 R_X86_64_PLT32 0000000000000000 pthread_attr_getstack - 4 00000000004e 001500000004 R_X86_64_PLT32 0000000000000000 pthread_attr_destroy - 4 @@ -170,7 +170,7 @@ Symbol table '.symtab' contains 22 entri 16: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND _GLOBAL_OFFSET_TABLE_ 17: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND pthread_self 18: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND pthread_attr_init - 19: 0000000000000000 0 NOTYPE GLOBAL HIDDEN UND pthread_attr_get_np + 19: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND pthread_attr_get_np 20: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND pthread_attr_getstack 21: 0000000000000000 0 NOTYPE GLOBAL DEFAULT UND pthread_attr_destroy %% Index: www/firefox-devel/files/patch-js-src-Makefile.in =================================================================== --- www/firefox-devel/files/patch-js-src-Makefile.in (revision 430) +++ www/firefox-devel/files/patch-js-src-Makefile.in (working copy) @@ -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 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,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 + %%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86zktn272o.fsf>