Subject: Re: galeon
To: Rene Hexel <rh@netbsd.org>
From: None <hiramatu@boreas.dti.ne.jp>
List: tech-pkg
Date: 01/30/2003 01:06:44
Thanks for the reply.

At 29 Jan 2003 08:15:47 +1000,
Rene Hexel wrote:
>   However, I believe this really needs to be fixed in mozilla. 
> Mozilla's libnspr4.so should be linked against libpthread under systems
> with native threads.  Otherwise, such a check needs to be added to every
> package linking against mozilla's libraries.

How about this patch for mozilla? This makes libnspr4.so link
against libpthread.

diff -bNur mozilla.orig/Makefile.common mozilla/Makefile.common
--- mozilla.orig/Makefile.common	Thu Jan 30 00:41:11 2003
+++ mozilla/Makefile.common	Thu Jan 30 00:41:22 2003
@@ -112,6 +112,7 @@
 CONFIGURE_ARGS+= --without-pthreads
 .else
 CONFIGURE_ARGS+= --with-pthreads
+MAKE_ENV+= PTHREAD_TYPE=${PTHREAD_TYPE}
 .endif
 
 .if ${MOZILLA_USE_XFT} == "YES"
diff -bNur mozilla.orig/distinfo mozilla/distinfo
--- mozilla.orig/distinfo	Thu Jan 30 00:41:11 2003
+++ mozilla/distinfo	Thu Jan 30 00:41:22 2003
@@ -14,3 +14,4 @@
 SHA1 (patch-be) = da2d741f7fbfa9538e3baab250a57b948335e2f6
 SHA1 (patch-bm) = 90293a32a571e58884a815b4ca18616bed4fb3af
 SHA1 (patch-bn) = fe5152d4f4bb8bd791249237f0dcd14e11ba27d1
+SHA1 (patch-bo) = c3c5a0bbf712311ee1d2c72d42eb7e7e5e8655e3
diff -bNur mozilla.orig/patches/patch-bo mozilla/patches/patch-bo
--- mozilla.orig/patches/patch-bo	Thu Jan  1 09:00:00 1970
+++ mozilla/patches/patch-bo	Thu Jan 30 00:41:22 2003
@@ -0,0 +1,15 @@
+--- nsprpub/pr/src/Makefile.in.orig	Wed Jan 29 23:49:00 2003
++++ nsprpub/pr/src/Makefile.in	Wed Jan 29 23:49:13 2003
+@@ -65,6 +65,12 @@
+ # Define platform-dependent OS_LIBS
+ #
+ 
++ifeq ($(OS_ARCH), NetBSD)                 
++ifeq ($(PTHREAD_TYPE), native)
++OS_LIBS = -lpthread
++endif
++endif
++
+ ifeq ($(OS_ARCH),SunOS)
+ ifeq ($(OS_RELEASE),4.1.3_U1)
+ OS_LIBS			= -lm

----
// Hiramatsu, Yoshifumi
// hiramatu@boreas.dti.ne.jp