From ff408e614d7b6b25520c4a5ab423d2e3192001ba Mon Sep 17 00:00:00 2001
From: martin <martin@pkgsrc.org>
Date: Fri, 15 Dec 2000 08:23:46 +0000
Subject: Ouch, accidently removed r1.12 with last commit - back that part out,
 sorry.

---
 www/mozilla/patches/patch-ab | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'www/mozilla')

diff --git a/www/mozilla/patches/patch-ab b/www/mozilla/patches/patch-ab
index b9dbb0e8e8f..1931cc24597 100644
--- a/www/mozilla/patches/patch-ab
+++ b/www/mozilla/patches/patch-ab
@@ -1,8 +1,7 @@
-$NetBSD: patch-ab,v 1.13 2000/12/15 07:16:22 martin Exp $
+$NetBSD: patch-ab,v 1.14 2000/12/15 08:23:46 martin 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
  			;;
-- 
cgit v1.2.3