summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sdk/Makefile2
-rw-r--r--sdk/recipes/patches/nspr/arm-unknown-riscos/ptthread.c.p11
2 files changed, 12 insertions, 1 deletions
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;
+