[pkgsrc/trunk]: pkgsrc/mk Further refine AIX support. From Jens Rehsack.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d72cf341c91
branches:  trunk
changeset: 552787:1d72cf341c91
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jan 09 11:46:34 2009 +0000

description:
Further refine AIX support. From Jens Rehsack.

diffstat:

 mk/compiler/xlc.mk          |   4 ++--
 mk/wrapper/cmd-sink-aix-cc  |  16 ++++++++++++++--
 mk/wrapper/cmd-sink-aix-xlc |  16 ++++++++++++++--
 3 files changed, 30 insertions(+), 6 deletions(-)

diffs (90 lines):

diff -r 891b1253ac6d -r 1d72cf341c91 mk/compiler/xlc.mk
--- a/mk/compiler/xlc.mk        Fri Jan 09 11:35:18 2009 +0000
+++ b/mk/compiler/xlc.mk        Fri Jan 09 11:46:34 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: xlc.mk,v 1.21 2008/12/29 21:26:55 joerg Exp $
+# $NetBSD: xlc.mk,v 1.22 2009/01/09 11:46:34 joerg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -135,7 +135,7 @@
        ${RUN}${MKDIR} ${.TARGET:H}
        ${RUN}                                          \
        (${ECHO} '#!${TOOLS_SHELL}';                    \
-        ${ECHO} 'exec ${XLCBASE}/bin/xlc -E @$$@"';    \
+        ${ECHO} 'exec ${XLCBASE}/bin/xlc -E "$$@"';    \
        ) > ${.TARGET}
        ${RUN}${CHMOD} +x ${.TARGET}
 
diff -r 891b1253ac6d -r 1d72cf341c91 mk/wrapper/cmd-sink-aix-cc
--- a/mk/wrapper/cmd-sink-aix-cc        Fri Jan 09 11:35:18 2009 +0000
+++ b/mk/wrapper/cmd-sink-aix-cc        Fri Jan 09 11:46:34 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: cmd-sink-aix-cc,v 1.4 2008/12/29 16:53:06 joerg Exp $
+# $NetBSD: cmd-sink-aix-cc,v 1.5 2009/01/09 11:46:34 joerg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -75,13 +75,25 @@
                dynamic=yes
                ;;
        -rpath)
-               pop_queue argbuf dir
+               pop_queue cmdbuf dir
                case $blibpath in
                "")     blibpath="$dir" ;;
                *)      blibpath="$blibpath:$dir" ;;
                esac
                $debug_log $wrapperlog "    (cmd-sink-aix-cc) drop: $dir [adding to blibpath]"
                ;;
+       -shared)
+               arg="-bshared"
+               . $buildcmd
+               ;;
+       -Wl,-soname*)
+               arg=-brtl
+               . $buildcmd
+               arg=-Wl,-G
+               . $buildcmd
+               arg=-Wl,-bexpall
+               . $buildcmd
+               ;;
        *)
                . $buildcmd
                ;;
diff -r 891b1253ac6d -r 1d72cf341c91 mk/wrapper/cmd-sink-aix-xlc
--- a/mk/wrapper/cmd-sink-aix-xlc       Fri Jan 09 11:35:18 2009 +0000
+++ b/mk/wrapper/cmd-sink-aix-xlc       Fri Jan 09 11:46:34 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: cmd-sink-aix-xlc,v 1.8 2008/12/29 16:53:06 joerg Exp $
+# $NetBSD: cmd-sink-aix-xlc,v 1.9 2009/01/09 11:46:34 joerg Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -71,13 +71,25 @@
                ;;
        # GCC and xlC allow -rpath directly, so keep this behavior.
        -rpath)
-               pop_queue argbuf dir
+               pop_queue cmdbuf dir
                case $blibpath in
                "")     blibpath="$dir" ;;
                *)      blibpath="$blibpath:$dir" ;;
                esac
                $debug_log $wrapperlog "    (cmd-sink-aix-xlc) drop: $dir [adding to blibpath]"
                ;;
+       -shared)
+               arg="-bshared"
+               . $buildcmd
+               ;;
+       -Wl,-soname*)
+               arg=-brtl
+               . $buildcmd
+               arg=-Wl,-G
+               . $buildcmd
+               arg=-Wl,-bexpall
+               . $buildcmd
+               ;;
        *)
                . $buildcmd
                ;;