[pkgsrc/trunk]: pkgsrc/mk/wrapper properly detect icc 8.1, which needs a diff...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/367659c6bcfa
branches:  trunk
changeset: 489090:367659c6bcfa
user:      grant <grant%pkgsrc.org@localhost>
date:      Wed Feb 16 10:59:03 2005 +0000

description:
properly detect icc 8.1, which needs a different argument to
statically link the Intel provided libraries.

diffstat:

 mk/wrapper/bsd.wrapper.mk    |  13 ++++++++-
 mk/wrapper/cmd-sink-icc81-cc |  59 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletions(-)

diffs (99 lines):

diff -r 4e4b8fc72b2d -r 367659c6bcfa mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Wed Feb 16 10:48:40 2005 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Wed Feb 16 10:59:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.22 2005/02/15 07:43:43 grant Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.23 2005/02/16 10:59:03 grant Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -239,8 +239,13 @@
 .endif
 
 .if !empty(PKGSRC_COMPILER:Micc)
+.  if !empty(CC_VERSION:M8.1)
+_WRAP_CMD_SINK.CC=     ${WRAPPER_TMPDIR}/cmd-sink-icc81-cc
+_WRAP_CMD_SINK.CXX=    ${_WRAP_CMD_SINK.CC}
+.  else
 _WRAP_CMD_SINK.CC=     ${WRAPPER_TMPDIR}/cmd-sink-icc-cc
 _WRAP_CMD_SINK.CXX=    ${_WRAP_CMD_SINK.CC}
+.  endif
 _WRAP_CACHE_BODY.CC=   ${WRAPPER_TMPDIR}/cache-body-icc-cc
 _WRAP_CACHE_BODY.CXX=  ${_WRAP_CACHE_BODY.CC}
 _WRAP_TRANSFORM.CC=    ${WRAPPER_TMPDIR}/transform-icc-cc
@@ -499,6 +504,12 @@
        ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}                    \
                | ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 
+${WRAPPER_TMPDIR}/cmd-sink-icc81-cc:                                   \
+               ${WRAPPER_SRCDIR}/cmd-sink-icc81-cc
+       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+       ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}                    \
+               | ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+
 ${WRAPPER_TMPDIR}/transform-icc-cc:                                    \
                ${WRAPPER_SRCDIR}/transform-icc-cc
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
diff -r 4e4b8fc72b2d -r 367659c6bcfa mk/wrapper/cmd-sink-icc81-cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/wrapper/cmd-sink-icc81-cc      Wed Feb 16 10:59:03 2005 +0000
@@ -0,0 +1,59 @@
+# $NetBSD: cmd-sink-icc81-cc,v 1.1 2005/02/16 10:59:03 grant 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. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#        This product includes software developed by the NetBSD
+#        Foundation, Inc. and its contributors.
+# 4. 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.
+
+# all icc built dynamic libraries and executables need to be linked
+# with ${ICCBASE}/lib in the rpath, or statically linked against the
+# icc provided libraries. use the static linking method so binary
+# packages can be used on systems that do not have these libraries
+# available.
+arg=-i-static
+$debug_log $wrapperlog "    (cmd-sink-icc81-cc) pop:  $arg"
+. $buildcmd
+
+while ! queue_is_empty cmdbuf; do
+       pop_queue cmdbuf arg
+       case "$arg" in
+       -MT)
+               pop_queue cmdbuf arg2
+               $debug_log $wrapperlog "    (cmd-sink-icc81-cc) pop:  $arg $arg2 [drop]"
+               ;;
+
+       *)
+               $debug_log $wrapperlog "    (cmd-sink-icc81-cc) pop:  $arg"
+               . $buildcmd
+               ;;
+       esac
+done