pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/wrapper add wrappers to transform arguments for AIX...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2e16f5d3c0f9
branches: trunk
changeset: 489256:2e16f5d3c0f9
user: grant <grant%pkgsrc.org@localhost>
date: Sat Feb 19 04:19:59 2005 +0000
description:
add wrappers to transform arguments for AIX's ld(1), notably, if we
are dynamically linking, the -brtl flag must be passed to the linker
so that the runtime linker is used.
tested on AIX 4.3 and 5.1 by garbled@.
diffstat:
mk/wrapper/bsd.wrapper.mk | 28 +++++++++++++-
mk/wrapper/cmd-sink-aix-cc | 87 +++++++++++++++++++++++++++++++++++++++++++++
mk/wrapper/cmd-sink-aix-ld | 87 +++++++++++++++++++++++++++++++++++++++++++++
mk/wrapper/transform-aix-cc | 52 ++++++++++++++++++++++++++
4 files changed, 253 insertions(+), 1 deletions(-)
diffs (294 lines):
diff -r 28bb7556b1b8 -r 2e16f5d3c0f9 mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Sat Feb 19 04:07:31 2005 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Sat Feb 19 04:19:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.23 2005/02/16 10:59:03 grant Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.24 2005/02/19 04:19:59 grant Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -316,6 +316,14 @@
_WRAP_CMD_SINK.CC= ${WRAPPER_TMPDIR}/cmd-sink-osf1-cc
_WRAP_CMD_SINK.CXX= ${_WRAP_CMD_SINK.CC}
_WRAP_CMD_SINK.LD= ${WRAPPER_TMPDIR}/cmd-sink-osf1-ld
+.elif ${OPSYS} == "AIX"
+_WRAP_CMD_SINK.CC= ${WRAPPER_TMPDIR}/cmd-sink-aix-cc
+_WRAP_CMD_SINK.CXX= ${_WRAP_CMD_SINK.CC}
+_WRAP_CMD_SINK.LD= ${WRAPPER_TMPDIR}/cmd-sink-aix-ld
+_WRAP_CACHE_BODY.CC= ${WRAPPER_TMPDIR}/cache-body-aix-cc
+_WRAP_TRANSFORM.CC= ${WRAPPER_TMPDIR}/transform-aix-cc
+_WRAP_CACHE_BODY.CXX= ${_WRAP_CACHE_BODY.CC}
+_WRAP_TRANSFORM.CXX= ${_WRAP_TRANSFORM.CC}
.endif
# Filter to scrunch shell scripts by removing comments and empty lines.
@@ -456,6 +464,18 @@
${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} \
| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+${WRAPPER_TMPDIR}/cmd-sink-aix-cc: \
+ ${WRAPPER_SRCDIR}/cmd-sink-aix-cc
+ ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+ ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} \
+ | ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+
+${WRAPPER_TMPDIR}/cmd-sink-aix-ld: \
+ ${WRAPPER_SRCDIR}/cmd-sink-aix-ld
+ ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
+ ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} \
+ | ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+
${WRAPPER_TMPDIR}/cmd-sink-darwin-xlc: \
${WRAPPER_SRCDIR}/cmd-sink-darwin-xlc
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
@@ -510,6 +530,12 @@
${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} \
| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+${WRAPPER_TMPDIR}/transform-aix-cc: \
+ ${WRAPPER_SRCDIR}/transform-aix-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 28bb7556b1b8 -r 2e16f5d3c0f9 mk/wrapper/cmd-sink-aix-cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/wrapper/cmd-sink-aix-cc Sat Feb 19 04:19:59 2005 +0000
@@ -0,0 +1,87 @@
+# $NetBSD: cmd-sink-aix-cc,v 1.1 2005/02/19 04:19:59 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.
+
+# Empty out the command buffer and build up the command line in $cmd.
+blibpath=
+dynamic=
+
+while ! queue_is_empty cmdbuf; do
+ pop_queue cmdbuf arg
+ $debug_log $wrapperlog " (cmd-sink-aix-cc) pop: $arg"
+ case $arg in
+ ##############################################################
+ # AIX ld(1) doesn't support -Wl,-rpath,* but accumulate them
+ # into a path collection we can later append to command line
+ # using -blibpath.
+ ##############################################################
+ -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}"
+ case "$blibpath" in
+ "") blibpath="$dir" ;;
+ *) blibpath="$blibpath:$dir" ;;
+ esac
+ $debug_log " (cmd-sink-aix-cc) drop: $dir [adding to blibpath]"
+ dynamic=yes
+ ;;
+ *)
+ . $buildcmd
+ ;;
+ esac
+done
+
+# AIX ld(1) uses -blibpath to set the runtime library search path.
+if $test -n "$blibpath"; then
+ arg="-Wl,-blibpath:/lib:/usr/lib:$blibpath"
+ $debug_log " (cmd-sink-aix-cc) pop: $arg"
+ . $buildcmd
+fi
+
+# If we are dynamically linking, make sure the runtime linker is used.
+if $test -n "$dynamic"; then
+ arg=-Wl,-brtl
+ $debug_log " (cmd-sink-aix-cc) pop: $arg"
+ . $buildcmd
+ arg=-Wl,-bdynamic
+ $debug_log " (cmd-sink-aix-cc) pop: $arg"
+ . $buildcmd
+fi
diff -r 28bb7556b1b8 -r 2e16f5d3c0f9 mk/wrapper/cmd-sink-aix-ld
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/wrapper/cmd-sink-aix-ld Sat Feb 19 04:19:59 2005 +0000
@@ -0,0 +1,87 @@
+# $NetBSD: cmd-sink-aix-ld,v 1.1 2005/02/19 04:19:59 grant Exp $
+#
+# Copyright (c) 2004 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Johnny C. Lam.
+#
+# 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.
+
+# Empty out the command buffer and build up the command line in $cmd.
+blibpath=
+dynamic=
+
+while ! queue_is_empty cmdbuf; do
+ pop_queue cmdbuf arg
+ $debug_log $wrapperlog " (cmd-sink-aix-ld) pop: $arg"
+ case $arg in
+ ##############################################################
+ # AIX ld(1) doesn't support -Wl,-rpath,* but accumulate them
+ # into a path collection we can later append to command line
+ # using -blibpath.
+ ##############################################################
+ -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}"
+ case $blibpath in
+ "") blibpath="$dir" ;;
+ *) blibpath="$blibpath:$dir" ;;
+ esac
+ $debug_log " (cmd-sink-aix-ld) drop: $dir [adding to blibpath]"
+ dynamic=yes
+ ;;
+ *)
+ . $buildcmd
+ ;;
+ esac
+done
+
+# AIX ld(1) uses -blibpath to set the runtime library search path.
+if $test -n "$blibpath"; then
+ arg="-blibpath:/lib:/usr/lib:$blibpath"
+ $debug_log " (cmd-sink-aix-ld) pop: $arg"
+ . $buildcmd
+fi
+
+# If we are dynamically linking, make sure the runtime linker is used.
+if $test -n "$dynamic"; then
+ arg=-brtl
+ $debug_log " (cmd-sink-aix-ld) pop: $arg"
+ . $buildcmd
+ arg=-bdynamic
+ $debug_log " (cmd-sink-aix-ld) pop: $arg"
+ . $buildcmd
+fi
diff -r 28bb7556b1b8 -r 2e16f5d3c0f9 mk/wrapper/transform-aix-cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/wrapper/transform-aix-cc Sat Feb 19 04:19:59 2005 +0000
@@ -0,0 +1,52 @@
+# $NetBSD: transform-aix-cc,v 1.1 2005/02/19 04:19:59 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.
+
+# prepend -Wl, to linker arguments commonly passed to the compiler.
+case $arg in
+-H[0-9]*|-T[0-9]*|-b*)
+ arg=-Wl,$arg
+ msg_log $wrapperlog " (transform-aix-cc) to: $arg"
+ addtocache=yes
+ ;;
+# AIX ld(1) uses -G to create shared libraries, and we must make sure
+# the runtime linker is used.
+-shared)
+ arg="-Wl,-G -Wl,-brtl"
+ msg_log $wrapperlog " (transform-aix-cc) to: $arg"
+ addtocache=yes
+ split_arg=yes
+ ;;
+esac
Home |
Main Index |
Thread Index |
Old Index