Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/77e33af042e8cae74f... ...commit http://git.netsurf-browser.org/toolchains.git/commit/77e33af042e8cae74fab... ...tree http://git.netsurf-browser.org/toolchains.git/tree/77e33af042e8cae74fab18... The branch, master has been updated via 77e33af042e8cae74fab188ecd94e6adbcd844fc (commit) from 6ffb88792a63ed15117b01aae9ac844f7b6da1dc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/toolchains.git/commitdiff/77e33af042e8cae7... commit 77e33af042e8cae74fab188ecd94e6adbcd844fc Author: Vincent Sanders <vince(a)kyllikki.org&gt; Commit: Vincent Sanders <vince(a)kyllikki.org&gt; Use information and patch from Chris Gransden to make nspr compile with pthreads diff --git a/sdk/Makefile b/sdk/Makefile index 7866b84..895ee90 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -467,7 +467,7 @@ $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz: # nspr $(BUILDSTEPS)/nspr.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr-src.d - cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) CROSS_COMPILE=1 CFLAGS=-D_PR_LOCAL_THREADS_ONLY ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-pthreads --without-thumb --without-thumb-interwork --with-arch=armv3 + cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --disable-shared --without-thumb --without-thumb-interwork --with-arch=armv3 cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) make cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) make install touch $@ diff --git a/sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p b/sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p new file mode 100644 index 0000000..8eb6824 --- /dev/null +++ b/sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p @@ -0,0 +1,11 @@ +--- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig 2012-12-11 13:03:16.440827000 +0000 ++++ mozilla/nsprpub/pr/src/pthreads/ptthread.c 2012-12-11 13:03:42.923932000 +0000 +@@ -1651,7 +1651,7 @@ + #endif + + *(void**)(&dynamic_pthread_setname_np) = +- dlsym(RTLD_DEFAULT, "pthread_setname_np"); ++ dlsym(RTLD_GLOBAL, "pthread_setname_np"); + if (!dynamic_pthread_setname_np) + return PR_SUCCESS; + ----------------------------------------------------------------------- Summary of changes: sdk/Makefile | 2 +- .../patches/nspr/arm-unknown-riscos/ptthread.c.p | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) create mode 100644 sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p diff --git a/sdk/Makefile b/sdk/Makefile index 7866b84..895ee90 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -467,7 +467,7 @@ $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz: # nspr $(BUILDSTEPS)/nspr.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr-src.d - cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) CROSS_COMPILE=1 CFLAGS=-D_PR_LOCAL_THREADS_ONLY ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-pthreads --without-thumb --without-thumb-interwork --with-arch=armv3 + cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --disable-shared --without-thumb --without-thumb-interwork --with-arch=armv3 cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) make cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) make install touch $@ diff --git a/sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p b/sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p new file mode 100644 index 0000000..8eb6824 --- /dev/null +++ b/sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p @@ -0,0 +1,11 @@ +--- mozilla/nsprpub/pr/src/pthreads/ptthread.c.orig 2012-12-11 13:03:16.440827000 +0000 ++++ mozilla/nsprpub/pr/src/pthreads/ptthread.c 2012-12-11 13:03:42.923932000 +0000 +@@ -1651,7 +1651,7 @@ + #endif + + *(void**)(&dynamic_pthread_setname_np) = +- dlsym(RTLD_DEFAULT, "pthread_setname_np"); ++ dlsym(RTLD_GLOBAL, "pthread_setname_np"); + if (!dynamic_pthread_setname_np) + return PR_SUCCESS; + -- Cross-compilation toolchains and environments