Fix build on a.out - for a.out only disable

	MKSHLIB_FORCE_ALL='-Wl,--whole-archive' and
	MKSHLIB_UNFORCE_ALL='-Wl,--no-whole-archive'
The a.out toolchain ignores --no-whole-archive, and linking mozilla-bin
attempts to an ill fated
    "collect2 ... --whole-archive ... --no-whole-archive ... -lgcc ... -lgcc"
Analysis by Richard Earnshaw in PR/11703

2 files changed, 16 insertions, 14 deletions

diff --git a/www/mozilla/files/patch-sum b/www/mozilla/files/patch-sum
index 447e5338858..1b59021c478 100644
--- a/www/mozilla/files/patch-sum
+++ b/www/mozilla/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.35 2000/11/26 03:53:34 mycroft Exp $
+$NetBSD: patch-sum,v 1.36 2000/12/14 18:18:50 abs Exp $
 
 MD5 (patch-17146) = 4238a105874cd574f587bba8572ffc6c
 MD5 (patch-aa) = a07a4956a8c6a91fce0ef653b59c902f
-MD5 (patch-ab) = dfa8ac0ffaac96293904adb6372c5b8d
+MD5 (patch-ab) = 2f3494ebc4c115ce359fee85fb6da34e
 MD5 (patch-ac) = 37c5e93a87f43262c38c9fe46a513740
 MD5 (patch-ad) = 20c5cd3f70cae6cca5b1f3eff4421f8b
 MD5 (patch-ae) = 576be09ebce960ac0d970c3a80b8591e
diff --git a/www/mozilla/patches/patch-ab b/www/mozilla/patches/patch-ab
index a84a31c604f..f7bcb5d9723 100644
--- a/www/mozilla/patches/patch-ab
+++ b/www/mozilla/patches/patch-ab
@@ -1,8 +1,7 @@
-$NetBSD: patch-ab,v 1.11 2000/10/14 09:24:46 martin Exp $
+$NetBSD: patch-ab,v 1.12 2000/12/14 18:18:50 abs Exp $
 
-diff -ru /usr/local/src/mozilla/configure.in ./configure.in
---- /usr/local/src/mozilla/configure.in	Sun Oct  1 15:16:13 2000
-+++ ./configure.in	Fri Oct 13 11:23:07 2000
+--- configure.in.orig	Sat Sep 30 23:16:13 2000
++++ configure.in	Wed Dec 13 10:11:27 2000
 @@ -360,8 +360,6 @@
  TARGET_MD_ARCH=unix
  DIRENT_INO=d_ino
@@ -12,7 +11,7 @@ diff -ru /usr/local/src/mozilla/configure.in ./configure.in
  
  MOZ_JPEG_CFLAGS=
  MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg'
-@@ -705,31 +703,24 @@
+@@ -705,31 +703,26 @@
      if $CC -E - -dM </dev/null | grep __ELF__ >/dev/null; then
          DLL_SUFFIX=".so"
          DSO_PIC_CFLAGS='-fPIC -DPIC'
@@ -20,18 +19,21 @@ diff -ru /usr/local/src/mozilla/configure.in ./configure.in
 -        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'
      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.
+-    # 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'
-+    MKSHLIB_FORCE_ALL='-Wl,--whole-archive'
-+    MKSHLIB_UNFORCE_ALL='-Wl,--no-whole-archive'
      case $OS_TEST in
  	alpha)
  		dnl NetBSD/alpha can't find a shared lib
@@ -49,7 +51,7 @@ diff -ru /usr/local/src/mozilla/configure.in ./configure.in
      fi
      ;;
  
-@@ -981,8 +972,6 @@
+@@ -981,8 +974,6 @@
  
  dnl See above (netbsd)
  AC_SUBST(NEED_BASE_DLL_NAME_ALSO)
@@ -58,7 +60,7 @@ diff -ru /usr/local/src/mozilla/configure.in ./configure.in
  
  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 +1184,6 @@
+@@ -1195,12 +1186,6 @@
      AM_PATH_GTK($GTK_VERSION,,
        AC_MSG_ERROR(Test for GTK failed.))
  
@@ -71,7 +73,7 @@ diff -ru /usr/local/src/mozilla/configure.in ./configure.in
  dnl ========================================================
  dnl =							   =
  dnl = --with-java-supplement				   =
-@@ -1691,13 +1674,6 @@
+@@ -1691,13 +1676,6 @@
  AC_SUBST(GLIB_CFLAGS)
  AC_SUBST(GLIB_LIBS)
  
@@ -85,7 +87,7 @@ diff -ru /usr/local/src/mozilla/configure.in ./configure.in
  dnl Checks for typedefs, structures, and compiler characteristics.
  dnl ========================================================
  AC_C_CONST
-@@ -2046,6 +2022,9 @@
+@@ -2046,6 +2024,9 @@
  				CXXFLAGS="$CXXFLAGS -mt" 
  			fi
  			;;