From cb1ac20e13a5f9e7fca55c049cdf149da66b2d73 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Fri, 9 Jan 2009 11:46:34 +0000
Subject: Further refine AIX support. From Jens Rehsack.

---
 mk/wrapper/cmd-sink-aix-cc  | 16 ++++++++++++++--
 mk/wrapper/cmd-sink-aix-xlc | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

(limited to 'mk/wrapper')

diff --git a/mk/wrapper/cmd-sink-aix-cc b/mk/wrapper/cmd-sink-aix-cc
index 7d1923364a6..2dfbff16811 100644
--- a/mk/wrapper/cmd-sink-aix-cc
+++ b/mk/wrapper/cmd-sink-aix-cc
@@ -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 @@ while ! queue_is_empty cmdbuf; do
 		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 --git a/mk/wrapper/cmd-sink-aix-xlc b/mk/wrapper/cmd-sink-aix-xlc
index 8288a814f2a..ae8b9f118d7 100644
--- a/mk/wrapper/cmd-sink-aix-xlc
+++ b/mk/wrapper/cmd-sink-aix-xlc
@@ -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 @@ while ! queue_is_empty cmdbuf; do
 		;;
 	# 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
 		;;
-- 
cgit v1.2.3