Pullup ticket 709 - requested by Grant Beattie

portability fixes for compiler wrapper

Revisions pulled up:
- pkgsrc/mk/wrapper/arg-pp-sunpro-cxx		1.1, 1.2
- pkgsrc/mk/wrapper/bsd.wrapper.mk		1.36, 1.37
- pkgsrc/mk/wrapper/transform-sunpro-cc		1.9

   Module Name:		pkgsrc
   Committed By:	grant
   Date:		Tue Jul 26 07:36:54 UTC 2005

   Modified Files:
   	pkgsrc/mk/wrapper: bsd.wrapper.mk

   Log Message:
   icc 9.0 wants the same options as 8.1.
---
   Module Name:		pkgsrc
   Committed By:	grant
   Date:		Sat Aug 20 02:11:15 UTC 2005

   Modified Files:
   	pkgsrc/mk/wrapper: transform-sunpro-cc

   Log Message:
   add -xnolibmopt after -fast to disable the use of libsunmath (until it
   can be sanely statically linked).
--
   Module Name:		pkgsrc
   Committed By:	grant
   Date:		Sat Aug 20 14:37:53 UTC 2005

   Modified Files:
   	pkgsrc/mk/wrapper: bsd.wrapper.mk
   Added Files:
   	pkgsrc/mk/wrapper: arg-pp-sunpro-cxx

   Log Message:
   strip leading "-Qoption ld" from -R args for sunpro C++ compiler, to
   avoid duplicate "-Qoption ld" args when the -R args is later stripped.

   thanks to jlam@ for the hint.
---
   Module Name:		pkgsrc
   Committed By:	grant
   Date:		Sun Aug 21 02:39:52 UTC 2005

   Modified Files:
   	pkgsrc/mk/wrapper: arg-pp-sunpro-cxx

   Log Message:
   preserve -Qoption arg if the 2nd next arg isn't -R.

3 files changed, 82 insertions, 4 deletions

diff --git a/mk/wrapper/arg-pp-sunpro-cxx b/mk/wrapper/arg-pp-sunpro-cxx
new file mode 100644
index 00000000000..6dc06de002b
--- /dev/null
+++ b/mk/wrapper/arg-pp-sunpro-cxx
@@ -0,0 +1,59 @@
+# $NetBSD: arg-pp-sunpro-cxx,v 1.2.2.2 2005/08/24 09:11:11 salo Exp $
+#
+# Copyright (c) 2005 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Grant Beattie.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of The NetBSD Foundation nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+case $arg in
+-Qoption)
+	argmatch=no
+	pop_queue argbuf nextarg1
+	$debug_log $wrapperlog "    (arg-pp-sunpro-cxx) pop:  $nextarg1"
+	case $nextarg1 in
+	ld)
+		argmatch=yes
+		pop_queue argbuf nextarg2
+		$debug_log $wrapperlog "    (arg-pp-sunpro-cxx) pop:  $nextarg2"
+		case $nextarg2 in
+		-R*)
+			$debug_log $wrapperlog "    (arg-pp-sunpro-cxx) pre:  $nextarg2"
+			prepend_queue argbuf $nextarg2
+			;;
+		*)
+			argok=yes
+			$debug_log $wrapperlog "    (arg-pp-sunpro-cxx) pre:  $nextarg2"
+			prepend_queue argbuf $nextarg2
+			$debug_log $wrapperlog "    (arg-pp-sunpro-cxx) pre:  $nextarg1"
+			prepend_queue argbuf $nextarg1
+			;;
+		esac
+		;;
+	esac
+	;;
+esac
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index 068cd2eecbf..6fe7dc43d27 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.32.2.2 2005/08/24 09:01:19 salo Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.32.2.3 2005/08/24 09:11:11 salo Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -226,7 +226,7 @@ _WRAP_CMD_SINK.LD=	${_WRAP_CMD_SINK.CC}
 .endif
 
 .if !empty(PKGSRC_COMPILER:Micc)
-.  if !empty(CC_VERSION:M8.1)
+.  if !empty(CC_VERSION:M8.1) || !empty(CC_VERSION:M9.0)
 _WRAP_CMD_SINK.CC=	${WRAPPER_TMPDIR}/cmd-sink-icc81-cc
 _WRAP_CMD_SINK.CXX=	${_WRAP_CMD_SINK.CC}
 .  else
@@ -256,6 +256,7 @@ _WRAP_TRANSFORM.CXX=	${_WRAP_TRANSFORM.CC}
 .endif
 
 .if !empty(PKGSRC_COMPILER:Msunpro)
+_WRAP_ARG_PP.CXX=	${WRAPPER_TMPDIR}/arg-pp-sunpro-cxx
 _WRAP_CMD_SINK.CXX=	${WRAPPER_TMPDIR}/cmd-sink-sunpro-cxx
 _WRAP_CACHE_BODY.CC=	${WRAPPER_TMPDIR}/cache-body-sunpro-cc
 _WRAP_TRANSFORM.CC=	${WRAPPER_TMPDIR}/transform-sunpro-cc
@@ -467,6 +468,12 @@ ${WRAPPER_TMPDIR}/arg-pp-mipspro-cc:					\
 	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
 		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 
+${WRAPPER_TMPDIR}/arg-pp-sunpro-cxx:					\
+		${WRAPPER_SRCDIR}/arg-pp-sunpro-cxx
+	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
+		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+
 ${WRAPPER_TMPDIR}/cmd-sink-aix-xlc:					\
 		${WRAPPER_SRCDIR}/cmd-sink-aix-xlc
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
diff --git a/mk/wrapper/transform-sunpro-cc b/mk/wrapper/transform-sunpro-cc
index d690f82c453..47a84a3cb77 100644
--- a/mk/wrapper/transform-sunpro-cc
+++ b/mk/wrapper/transform-sunpro-cc
@@ -1,4 +1,4 @@
-# $NetBSD: transform-sunpro-cc,v 1.2.8.2 2005/08/19 16:54:48 salo Exp $
+# $NetBSD: transform-sunpro-cc,v 1.2.8.3 2005/08/24 09:11:11 salo Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -128,9 +128,21 @@ case $arg in
 	split_arg=yes
 	;;
 ######################################################################
+# -fast implies -xlibmopt, which uses the optimized math routines in
+# libsunmath. libsunmath is only available as part of SunPro, so
+# disable the use of the optimized math library (at least until it can
+# be statically linked).
+######################################################################
+-fast)
+	arg="-fast -xnolibmopt"
+	msg_log $wrapperlog "   (transform-sunpro-cc) to: $arg"
+	addtocache=yes
+	split_arg=yes
+	;;
+######################################################################
 # Pass through -f flags that SunPro understands.
 ######################################################################
--fast|-fd|-features*|-flags|-flteval*|-fnonstd*|-fns*|-fprecision*|-fround*|-fsimple*|-fsingle|-fstore|-ftrap*)
+-fd|-features*|-flags|-flteval*|-fnonstd*|-fns*|-fprecision*|-fround*|-fsimple*|-fsingle|-fstore|-ftrap*)
 	addtocache=yes
 	;;
 ######################################################################