[pkgsrc/trunk]: pkgsrc/mk/wrapper Add IRIX command sinks, needed to get rpath...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e35c9c5b6f21
branches:  trunk
changeset: 538802:e35c9c5b6f21
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Feb 19 17:36:51 2008 +0000

description:
Add IRIX command sinks, needed to get rpath fixup when using GCC.

diffstat:

 mk/wrapper/bsd.wrapper.mk   |   8 +++++++-
 mk/wrapper/cmd-sink-irix-cc |  24 ++++++++++++++++++++++++
 mk/wrapper/cmd-sink-irix-ld |  26 ++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletions(-)

diffs (87 lines):

diff -r 95d82b9cc9fc -r e35c9c5b6f21 mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Tue Feb 19 17:21:42 2008 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Tue Feb 19 17:36:51 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.75 2007/11/28 14:45:22 rillig Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.76 2008/02/19 17:36:51 tnn Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -347,6 +347,10 @@
 _WRAP_TRANSFORM.CC=    ${WRAPPER_TMPDIR}/transform-aix-cc
 _WRAP_CACHE_BODY.CXX=  ${_WRAP_CACHE_BODY.CC}
 _WRAP_TRANSFORM.CXX=   ${_WRAP_TRANSFORM.CC}
+.elif ${OPSYS} == "IRIX"
+_WRAP_CMD_SINK.CC=     ${WRAPPER_TMPDIR}/cmd-sink-irix-cc
+_WRAP_CMD_SINK.CXX=    ${_WRAP_CMD_SINK.CC}
+_WRAP_CMD_SINK.LD=     ${WRAPPER_TMPDIR}/cmd-sink-irix-ld
 .endif
 
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
@@ -497,6 +501,8 @@
        cmd-sink-darwin-xlc \
        cmd-sink-icc-cc \
        cmd-sink-icc81-cc \
+       cmd-sink-irix-cc \
+       cmd-sink-irix-ld \
        cmd-sink-interix-gcc \
        cmd-sink-ld \
        cmd-sink-osf1-cc \
diff -r 95d82b9cc9fc -r e35c9c5b6f21 mk/wrapper/cmd-sink-irix-cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/wrapper/cmd-sink-irix-cc       Tue Feb 19 17:36:51 2008 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: cmd-sink-irix-cc,v 1.1 2008/02/19 17:36:51 tnn Exp $
+
+# Empty out the command buffer and build up the command line in $cmd.
+while ! queue_is_empty cmdbuf; do
+       pop_queue cmdbuf arg
+       $debug_log $wrapperlog "    (cmd-sink-irix-cc) pop:  $arg"
+       case $arg in
+       -R*|-Wl,-R*|-Wl,-rpath,*|-Wl,-rpath-link,*|-Wl,--rpath,*)
+               case $arg in
+               -R*)                    R="-R" ;;
+               -Wl,-R*)                R="-Wl,-R" ;;
+               -Wl,-rpath,*)           R="-Wl,-rpath," ;;
+               -Wl,-rpath-link,*)      R="-Wl,-rpath-link," ;;
+               -Wl,--rpath,*)          R="-Wl,--rpath," ;;
+               esac
+               dir="${arg#$R}"
+               arg="-Wl,-rpath,$dir"
+               . $buildcmd
+               ;;
+       *)
+               . $buildcmd
+               ;;
+       esac
+done
diff -r 95d82b9cc9fc -r e35c9c5b6f21 mk/wrapper/cmd-sink-irix-ld
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/wrapper/cmd-sink-irix-ld       Tue Feb 19 17:36:51 2008 +0000
@@ -0,0 +1,26 @@
+# $NetBSD: cmd-sink-irix-ld,v 1.1 2008/02/19 17:36:51 tnn Exp $
+
+# Empty out the command buffer and build up the command line in $cmd.
+while ! queue_is_empty cmdbuf; do
+       pop_queue cmdbuf arg
+       $debug_log $wrapperlog "    (cmd-sink-irix-ld) pop:  $arg"
+       case $arg in
+       -R*|-Wl,-R*|-Wl,-rpath,*|-Wl,-rpath-link,*|-Wl,--rpath,*)
+               case $arg in
+               -R*)                    R="-R" ;;
+               -Wl,-R*)                R="-Wl,-R" ;;
+               -Wl,-rpath,*)           R="-Wl,-rpath," ;;
+               -Wl,-rpath-link,*)      R="-Wl,-rpath-link," ;;
+               -Wl,--rpath,*)          R="-Wl,--rpath," ;;
+               esac
+               dir="${arg#$R}"
+               arg="-rpath"
+               . $buildcmd
+               arg="$dir"
+               . $buildcmd
+               ;;
+       *)
+               . $buildcmd
+               ;;
+       esac
+done