From e742bcc2aed10f72ed4c7dcda8b2d56455f68a25 Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Sat, 24 Apr 2004 10:35:23 +0000
Subject: don't pass "-Q option" to ${LD}, it isn't needed and the Solaris
 linker errors on it.

---
 www/mozilla/distinfo         |  4 ++--
 www/mozilla/patches/patch-ab | 22 +++++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'www')

diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 7bcbd4ec48b..707a1a90292 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.51 2004/04/23 15:32:04 taya Exp $
+$NetBSD: distinfo,v 1.52 2004/04/24 10:35:23 grant Exp $
 
 SHA1 (mozilla-source-1.6.tar.bz2) = baecca0ecec35704049ab6debaec6c96adbade35
 Size (mozilla-source-1.6.tar.bz2) = 31037452 bytes
 SHA1 (patch-aa) = 03f158fe673a54b8060d541c80f9ebda2977afc5
-SHA1 (patch-ab) = 3abad84d0768de60f845f26c61cc2629a6e25ce3
+SHA1 (patch-ab) = 9db4b88f3cc0feb267f8715c2e2238fd80b49f62
 SHA1 (patch-ac) = 4cddfd0bfc8acd97db3b974289a79c9ae41c9edf
 SHA1 (patch-ad) = 5408db4b7585dcf5855f64a342cc721a23aec449
 SHA1 (patch-ae) = e10936ff84d8f5b631c5c9f18271f21e902ea351
diff --git a/www/mozilla/patches/patch-ab b/www/mozilla/patches/patch-ab
index 2639a650f6d..e470cc1e078 100644
--- a/www/mozilla/patches/patch-ab
+++ b/www/mozilla/patches/patch-ab
@@ -1,9 +1,8 @@
-$NetBSD: patch-ab,v 1.30 2004/01/17 00:04:49 taya Exp $
+$NetBSD: patch-ab,v 1.31 2004/04/24 10:35:23 grant Exp $
 
-diff -ru ../Orig/mozilla/configure.in ./configure.in
---- ../Orig/mozilla/configure.in	2003-12-12 08:30:36.000000000 +0900
-+++ ./configure.in	2004-01-16 23:17:19.000000000 +0900
-@@ -959,6 +959,9 @@
+--- configure.in.orig	2003-12-12 10:30:36.000000000 +1100
++++ configure.in
+@@ -959,6 +959,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -13,7 +12,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      ;; 
  
  *-hpux*)
-@@ -1248,6 +1251,13 @@
+@@ -1248,6 +1251,13 @@ case "$target" in
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -27,7 +26,16 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      ;;
  
  *-nto*) 
-@@ -2192,9 +2202,6 @@
+@@ -1478,7 +1488,7 @@ dnl the qsort routine under solaris is f
+        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -o $@'
+        MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
+        MKSHLIB_UNFORCE_ALL=''
+-       DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@'
++       DSO_LDOPTS='-G -z muldefs -h $@'
+        AR_LIST="$AR t"
+        AR_EXTRACT="$AR x"
+        AR_DELETE="$AR d"
+@@ -2192,9 +2202,6 @@ then
  				CXXFLAGS="$CXXFLAGS -mt" 
  			fi
  			;;
-- 
cgit v1.2.3