Arrange to add -Wl,--export-dynamic to BIN_FLAGS, and nuke the (unused and

essentially complete bullshit) NEED_BASE_DLL_NAME_ALSO.

2 files changed, 40 insertions, 30 deletions

diff --git a/www/mozilla/patches/patch-aa b/www/mozilla/patches/patch-aa
index 0f36cad04e0..7b4589a7300 100644
--- a/www/mozilla/patches/patch-aa
+++ b/www/mozilla/patches/patch-aa
@@ -1,9 +1,16 @@
-$NetBSD: patch-aa,v 1.15 2000/10/14 09:24:46 martin Exp $
+$NetBSD: patch-aa,v 1.16 2001/01/13 19:33:27 mycroft Exp $
 
-diff -ru /usr/local/src/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in
---- /usr/local/src/mozilla/config/autoconf.mk.in	Fri Sep 15 09:19:30 2000
-+++ ./config/autoconf.mk.in	Fri Oct 13 11:23:07 2000
-@@ -238,8 +238,6 @@
+--- config/autoconf.mk.in.orig	Fri Sep 15 00:19:30 2000
++++ config/autoconf.mk.in	Sat Jan 13 19:25:34 2001
+@@ -72,7 +72,6 @@
+ NO_NETSCAPE_STATIC = @NO_STATIC_LIB@
+ ENABLE_TESTS	= @ENABLE_TESTS@
+ BUILD_IDLC = @BUILD_IDLC@
+-NEED_BASE_DLL_NAME_ALSO = @NEED_BASE_DLL_NAME_ALSO@
+ MOZ_ENDER_LITE = @MOZ_ENDER_LITE@
+ MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
+ 
+@@ -238,8 +237,6 @@
  MKSHLIB_UNFORCE_ALL     = @MKSHLIB_UNFORCE_ALL@
  DSO_LDOPTS              = @DSO_LDOPTS@
  DLL_SUFFIX              = @DLL_SUFFIX@
diff --git a/www/mozilla/patches/patch-ab b/www/mozilla/patches/patch-ab
index 350a17c802b..fb3e6ea8112 100644
--- a/www/mozilla/patches/patch-ab
+++ b/www/mozilla/patches/patch-ab
@@ -1,17 +1,18 @@
-$NetBSD: patch-ab,v 1.16 2000/12/16 14:22:08 abs Exp $
+$NetBSD: patch-ab,v 1.17 2001/01/13 19:33:27 mycroft Exp $
 
---- configure.in.orig	Sat Sep 30 23:16:13 2000
-+++ configure.in	Wed Dec 13 10:11:27 2000
-@@ -360,8 +360,6 @@
+--- configure.in.orig	Mon Nov 20 22:51:07 2000
++++ configure.in	Sat Jan 13 19:25:11 2001
+@@ -358,9 +358,6 @@
+ LIB_SUFFIX=a
  TARGET_MD_ARCH=unix
  DIRENT_INO=d_ino
- NEED_BASE_DLL_NAME_ALSO=
+-NEED_BASE_DLL_NAME_ALSO=
 -SHLIB_LDSTARTFILE=
 -SHLIB_LDENDFILE=
  
  MOZ_JPEG_CFLAGS=
  MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg'
-@@ -705,31 +703,26 @@
+@@ -701,31 +698,18 @@
      if $CC -E - -dM </dev/null | grep __ELF__ >/dev/null; then
          DLL_SUFFIX=".so"
          DSO_PIC_CFLAGS='-fPIC -DPIC'
@@ -19,48 +20,50 @@ $NetBSD: patch-ab,v 1.16 2000/12/16 14:22:08 abs Exp $
 -        SHLIB_LDSTARTFILE=/usr/lib/crtbeginS.o
 -        SHLIB_LDENDFILE=/usr/lib/crtendS.o
 +        DSO_LDOPTS='-shared -Wl,-soname,lib$(LIBRARY_NAME)$(DLL_SUFFIX)'
-+	MKSHLIB_FORCE_ALL='-Wl,--whole-archive'
-+	MKSHLIB_UNFORCE_ALL='-Wl,--no-whole-archive'
++	BIN_FLAGS='-Wl,--export-dynamic'
      else
      	DSO_PIC_CFLAGS='-fPIC -DPIC'
      	DLL_SUFFIX=".so.1.0"
 -    	DSO_LDOPTS='-x -shared'
 -    	SHLIB_LDSTARTFILE=/usr/lib/c++rt0.o
 +    	DSO_LDOPTS='-shared'
-+	MKSHLIB_FORCE_ALL=''
-+	MKSHLIB_UNFORCE_ALL=''
-+	# a.out ignores --no-whole-archive; using --whole-archive breaks link
      fi
 -    # At least for 1.3 and up, ld supports this, despite the test failing above.
 -    MKSHLIB_FORCE_ALL='--whole-archive'
 -    MKSHLIB_UNFORCE_ALL='--no-whole-archive'
-     case $OS_TEST in
- 	alpha)
- 		dnl NetBSD/alpha can't find a shared lib
- 		dnl (.so.1.0) unless there's a .so as well.
- 		NEED_BASE_DLL_NAME_ALSO=1
- 		;;
+-    case $OS_TEST in
+-	alpha)
+-		dnl NetBSD/alpha can't find a shared lib
+-		dnl (.so.1.0) unless there's a .so as well.
+-		NEED_BASE_DLL_NAME_ALSO=1
+-		;;
 -	*86)
 -		MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
 -		MKCSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
 -		;;
-     esac
+-    esac
++    # This will fail on a.out systems prior to 1.5.1_ALPHA.
++    MKSHLIB_FORCE_ALL='-Wl,--whole-archive'
++    MKSHLIB_UNFORCE_ALL='-Wl,--no-whole-archive'
      if test "$LIBRUNPATH"; then
 -	DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS"
 +	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
      fi
      ;;
  
-@@ -981,8 +974,6 @@
+@@ -977,11 +961,6 @@
+ 
+ esac
  
- dnl See above (netbsd)
- AC_SUBST(NEED_BASE_DLL_NAME_ALSO)
+-dnl See above (netbsd)
+-AC_SUBST(NEED_BASE_DLL_NAME_ALSO)
 -AC_SUBST(SHLIB_LDSTARTFILE)
 -AC_SUBST(SHLIB_LDENDFILE)
- 
+-
  dnl Only one oddball right now (QNX), but this gives us flexibility
  dnl if any other platforms need to override this in the future.
-@@ -1195,12 +1186,6 @@
+ AC_DEFINE_UNQUOTED(D_INO,$DIRENT_INO)
+@@ -1193,12 +1172,6 @@
      AM_PATH_GTK($GTK_VERSION,,
        AC_MSG_ERROR(Test for GTK failed.))
  
@@ -73,7 +76,7 @@ $NetBSD: patch-ab,v 1.16 2000/12/16 14:22:08 abs Exp $
  dnl ========================================================
  dnl =							   =
  dnl = --with-java-supplement				   =
-@@ -1691,13 +1676,6 @@
+@@ -1685,13 +1658,6 @@
  AC_SUBST(GLIB_CFLAGS)
  AC_SUBST(GLIB_LIBS)
  
@@ -87,7 +90,7 @@ $NetBSD: patch-ab,v 1.16 2000/12/16 14:22:08 abs Exp $
  dnl Checks for typedefs, structures, and compiler characteristics.
  dnl ========================================================
  AC_C_CONST
-@@ -2046,6 +2024,9 @@
+@@ -2003,6 +1969,9 @@
  				CXXFLAGS="$CXXFLAGS -mt" 
  			fi
  			;;