From 6eb39b9c3d894cdc4dbd3232cf0c85c0f9124975 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Tue, 13 Jul 2004 14:00:16 +0000
Subject: Pullup ticket 51 to the pkgsrc-2004Q2 branch, requested by Grant
 Beattie

Solaris bulk build fixes

	Module Name:    pkgsrc
	Committed By:   salo
	Date:           Sat Jul  3 20:39:26 UTC 2004

	Modified Files:
		pkgsrc/mk/buildlink3: sunpro-cc-post-logic

	Log Message:
	Convert -static to -Bstatic.


	Module Name:    pkgsrc
	Committed By:   grant
	Date:           Sat Jul  3 20:53:48 UTC 2004

	Modified Files:
		pkgsrc/mk/buildlink3: sunpro-cc-post-logic

	Log Message:
	fix typo and slight botch up in last


	Module Name:    pkgsrc
	Committed By:   grant
	Date:           Sat Jul  3 20:53:59 UTC 2004

	Modified Files:
		pkgsrc/mk/buildlink3: sunpro-cc-post-cache

	Log Message:
	update the cache for -static


	Module Name:    pkgsrc
	Committed By:   grant
	Date:           Sun Jul  4 08:30:46 UTC 2004

	Modified Files:
		pkgsrc/mk/buildlink3: sunpro-cc-post-cache sunpro-cc-post-logic

	Log Message:
	transform --export-dynamic to -G and strip -fstrict-prototypes.
---
 doc/CHANGES-pkgsrc-2004Q2          |  4 +++-
 mk/buildlink3/sunpro-cc-post-cache |  4 ++--
 mk/buildlink3/sunpro-cc-post-logic | 17 ++++++++++++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2
index 0454cc2cdbd..2a1fe7549a2 100644
--- a/doc/CHANGES-pkgsrc-2004Q2
+++ b/doc/CHANGES-pkgsrc-2004Q2
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.17 2004/07/09 06:56:00 agc Exp $
+$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.18 2004/07/13 14:00:16 agc Exp $
 
 Changes to the packages collection and infrastructure on the
 pkgsrc-2004Q2 branch:
@@ -30,3 +30,5 @@ Pullup ticket 49, requested by Grant Beattie [agc 2004-07-08, 2004-07-09]
 	${TEST} portability fixes
 Pullup ticket 50, requested by Martti Kuparinen [agc 2004-07-08]
 	security fix for ethereal
+Pullup ticket 51, requested by Grant Beattie [agc 2004-07-13]
+	Solaris bulk build fixes
diff --git a/mk/buildlink3/sunpro-cc-post-cache b/mk/buildlink3/sunpro-cc-post-cache
index 9d3af365c63..ebe31485f54 100644
--- a/mk/buildlink3/sunpro-cc-post-cache
+++ b/mk/buildlink3/sunpro-cc-post-cache
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro-cc-post-cache,v 1.7 2004/06/13 08:50:15 grant Exp $
+# $NetBSD: sunpro-cc-post-cache,v 1.7.2.1 2004/07/13 14:00:16 agc Exp $
 #
 # This file implements the default action of the "cc" private cache
 # for the SunPro suite of compilers, and tells the wrapper to skip the
@@ -6,7 +6,7 @@
 # can't handle; they will instead by handled directly by
 # sunpro-cc-post-logic.
 
--[OW]*|-ansi|-f[pP][iI][cC]|-fno-gnu-keywords|-pedantic|-pthread|-shared)
+-[OW]*|-ansi|--export-dynamic|-f[pP][iI][cC]|-fno-gnu-keywords|-fstrict-prototypes|-pedantic|-pthread|-shared|-static)
 	skipcache=yes
 	;;
 esac
diff --git a/mk/buildlink3/sunpro-cc-post-logic b/mk/buildlink3/sunpro-cc-post-logic
index 771f201359d..cf7541a8558 100644
--- a/mk/buildlink3/sunpro-cc-post-logic
+++ b/mk/buildlink3/sunpro-cc-post-logic
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro-cc-post-logic,v 1.8 2004/06/13 08:50:15 grant Exp $
+# $NetBSD: sunpro-cc-post-logic,v 1.8.2.1 2004/07/13 14:00:16 agc Exp $
 #
 # Silently accept some GCC compiler arguments by silently converting
 # them to the SunPro compiler equivalents.  This makes the SunPro
@@ -40,6 +40,11 @@ case $arg in
 	arg=
 	addtoprivatecache=yes
 	;;
+--export-dynamic)
+	# Solaris' linker uses -G to create shared objects.
+	arg=-G
+	addtoprivatecache=yes
+	;;
 -f[Pp][Ii][Cc])
 	# SunPro uses -Kpic to create position independent code.
 	#
@@ -50,6 +55,11 @@ case $arg in
 	arg=
 	addtoprivatecache=yes
 	;;
+	# No flag is required to enforce strict prototypes.
+-fstrict-prototypes)
+	arg=
+	addtoprivatecache=yes
+	;;
 -pedantic)
 	# No flag is required for SunPro to be pedantic.
 	arg=
@@ -67,4 +77,9 @@ case $arg in
 	arg=-G
 	addtoprivatecache=yes
 	;;
+-static)
+	# Solaris' linker uses -Bstatic to create static objects.
+	#
+	arg=-Bstatic
+	addtoprivatecache=yes
 esac
-- 
cgit v1.2.3