[pkgsrc/trunk]: pkgsrc/mk/wrapper Merged the transformations from the Solaris...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2c1e9bd5a932
branches:  trunk
changeset: 521895:2c1e9bd5a932
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Nov 26 13:02:53 2006 +0000

description:
Merged the transformations from the Solaris-specific gcc part into the
generic one. That way, the unknown options are reported properly on all
platforms.

diffstat:

 mk/wrapper/bsd.wrapper.mk        |   7 +-----
 mk/wrapper/transform-gcc         |  12 +++++++++-
 mk/wrapper/transform-solaris-gcc |  47 ----------------------------------------
 3 files changed, 12 insertions(+), 54 deletions(-)

diffs (105 lines):

diff -r 03e030bdcdfa -r 2c1e9bd5a932 mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Sun Nov 26 13:00:26 2006 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Sun Nov 26 13:02:53 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.58 2006/11/26 09:56:46 rillig Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.59 2006/11/26 13:02:53 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -332,10 +332,6 @@
 .endif
 
 .if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
-_WRAP_CACHE_BODY.CC=   ${WRAPPER_TMPDIR}/cache-body-solaris-gcc
-_WRAP_TRANSFORM.CC=    ${WRAPPER_TMPDIR}/transform-solaris-gcc
-_WRAP_CACHE_BODY.CXX=  ${_WRAP_CACHE_BODY.CC}
-_WRAP_TRANSFORM.CXX=   ${_WRAP_TRANSFORM.CC}
 _WRAP_CMD_SINK.IMAKE=  ${WRAPPER_TMPDIR}/cmd-sink-solaris-imake
 _WRAP_CACHE_BODY.IMAKE=        ${WRAPPER_TMPDIR}/cache-body-solaris-imake
 .endif
@@ -488,7 +484,6 @@
        transform-ido-cc \
        transform-mipspro-cc \
        transform-mipspro-ucode-cc \
-       transform-solaris-gcc \
        transform-sunpro-cc \
        transform-xlc-cc \
        wrapper-subr.sh
diff -r 03e030bdcdfa -r 2c1e9bd5a932 mk/wrapper/transform-gcc
--- a/mk/wrapper/transform-gcc  Sun Nov 26 13:00:26 2006 +0000
+++ b/mk/wrapper/transform-gcc  Sun Nov 26 13:02:53 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: transform-gcc,v 1.2 2006/11/26 10:00:04 rillig Exp $
+# $NetBSD: transform-gcc,v 1.3 2006/11/26 13:02:53 rillig Exp $
 #
 # This file prints warning messages for all obscure gcc options into the
 # wrapper log file.
@@ -6,6 +6,16 @@
 transform_setname "transform-gcc"
 
 case $arg in
+
+-KPIC|\
+-kPIC)
+       # Needed for the Solaris imake.
+       transform_to "-fPIC" ;;
+
+-mt)
+       # Needed on Solaris with SunPro.
+       transform_to "-threads" ;;
+
 -c|\
 -D?*|\
 -I?*|\
diff -r 03e030bdcdfa -r 2c1e9bd5a932 mk/wrapper/transform-solaris-gcc
--- a/mk/wrapper/transform-solaris-gcc  Sun Nov 26 13:00:26 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-# $NetBSD: transform-solaris-gcc,v 1.4 2006/09/17 18:46:00 rillig 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
-# the imake config templates on Solaris 8 pass -Kpic to build PIC, even
-# when -DHasGcc2=YES -DHasGcc2ForCplusplus=YES is passed, so transform
-# -Kpic to -fPIC.
--Kpic|-KPIC)
-       arg=-fPIC
-       $debug_log $wrapperlog "   (transform-solaris-gcc) to: $arg"
-       addtocache=yes
-       ;;
--mt)   # (from SunPro)
-       arg=-threads
-       $debug_log $wrapperlog "   (transform-solaris-gcc) to: $arg"
-       addtocache=yes
-       ;;
-esac