From e3734330e2921396eb1e494f29fb8d01fb052c95 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@pkgsrc.org>
Date: Sun, 5 Nov 2000 02:20:37 +0000
Subject: For now, add a hack to explicitly compile libgklayout.so with -xgot
 on MIPS platforms.  This needs a more comprehensive toolchain fix, but this
 is not the time to do it.

---
 www/mozilla/files/patch-sum  |  4 ++--
 www/mozilla/patches/patch-ag | 26 ++++++++++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'www')

diff --git a/www/mozilla/files/patch-sum b/www/mozilla/files/patch-sum
index 9566e5938a3..68da50bbedb 100644
--- a/www/mozilla/files/patch-sum
+++ b/www/mozilla/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.28 2000/10/31 18:08:26 mycroft Exp $
+$NetBSD: patch-sum,v 1.29 2000/11/05 02:20:37 mycroft Exp $
 
 MD5 (patch-aa) = a07a4956a8c6a91fce0ef653b59c902f
 MD5 (patch-ab) = dfa8ac0ffaac96293904adb6372c5b8d
@@ -6,7 +6,7 @@ MD5 (patch-ac) = 37c5e93a87f43262c38c9fe46a513740
 MD5 (patch-ad) = 20c5cd3f70cae6cca5b1f3eff4421f8b
 MD5 (patch-ae) = 576be09ebce960ac0d970c3a80b8591e
 MD5 (patch-af) = 316103ca86d2a079d940cff8102849f1
-MD5 (patch-ag) = 6550d516cf5395f38bd11fc3845f8a8d
+MD5 (patch-ag) = 37e370b4c51c8ffb5fc4c9dd2f1ace98
 MD5 (patch-ah) = 8f6975c0fb5454958416f2b87d789c99
 MD5 (patch-ai) = ebd71ac01fc02d0fa639af6348d1926e
 MD5 (patch-aj) = dae5f7b6f80a833fd63721c5c751fe0b
diff --git a/www/mozilla/patches/patch-ag b/www/mozilla/patches/patch-ag
index 3f14088b35d..3fd7b7d8424 100644
--- a/www/mozilla/patches/patch-ag
+++ b/www/mozilla/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.7 2000/10/29 22:59:32 mycroft Exp $
+$NetBSD: patch-ag,v 1.8 2000/11/05 02:20:38 mycroft Exp $
 
---- config/rules.mk.orig	Thu Sep 28 13:02:15 2000
-+++ config/rules.mk	Sun Oct 29 21:45:18 2000
-@@ -354,6 +354,18 @@
+--- config/rules.mk.orig	Thu Sep 28 00:02:15 2000
++++ config/rules.mk	Wed Nov  1 08:59:03 2000
+@@ -354,6 +354,27 @@
  endif
  
  #
@@ -17,7 +17,25 @@ $NetBSD: patch-ag,v 1.7 2000/10/29 22:59:32 mycroft Exp $
 +endif
 +endif
 +
++ifeq ($(OS_ARCH),NetBSD)
++ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST)))
++ifeq ($(MODULE),layout)
++OS_CFLAGS += -Wa,-xgot
++OS_CXXFLAGS += -Wa,-xgot
++endif
++endif
++endif
++
 +#
  # HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag
  # which uses internal symbols first
  #
+@@ -1393,7 +1414,7 @@
+ 	@echo "OS_CFLAGS          = $(OS_CFLAGS)"
+ 	@echo "COMPILE_CFLAGS     = $(COMPILE_CFLAGS)"
+ 	@echo "CXXFLAGS           = $(CXXFLAGS)"
+-	@echo "OS_CXXFLAGS        = $(OS_CFXXFLAGS)"
++	@echo "OS_CXXFLAGS        = $(OS_CXXFLAGS)"
+ 	@echo "COMPILE_CXXFLAGS   = $(COMPILE_CXXFLAGS)"
+ 	@echo "LDFLAGS            = $(LDFLAGS)"
+ 	@echo "OS_LDFLAGS         = $(OS_LDFLAGS)"
-- 
cgit v1.2.3