add handling for some required -Wl, transformations for packages that

assume Apple gcc on Darwin. thanks, Johnny :)

this allows perl to build with xlc.

2 files changed, 68 insertions, 1 deletions

diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index fd41b787249..31912ab8864 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.14 2004/11/30 15:07:26 jlam Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.15 2004/12/05 09:29:26 grant Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -260,6 +260,8 @@ _WRAP_TRANSFORM.CXX=	${_WRAP_TRANSFORM.CC}
 .endif
 
 .if !empty(PKGSRC_COMPILER:Mxlc)
+_WRAP_CMD_SINK.CC=	${WRAPPER_TMPDIR}/cmd-sink-darwin-xlc
+_WRAP_CMD_SINK.CXX=	${_WRAP_CMD_SINK.CC}
 _WRAP_CACHE_BODY.CC=	${WRAPPER_TMPDIR}/cache-body-xlc-cc
 _WRAP_TRANSFORM.CC=	${WRAPPER_TMPDIR}/transform-xlc-cc
 _WRAP_CACHE_BODY.CXX=	${_WRAP_CACHE_BODY.CC}
@@ -418,6 +420,12 @@ ${WRAPPER_TMPDIR}/cmd-sink-aix-xlc:					\
 	${_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}
+	${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC}			\
+		| ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+
 ${WRAPPER_TMPDIR}/cmd-sink-interix-gcc:					\
 		${WRAPPER_SRCDIR}/cmd-sink-interix-gcc
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
diff --git a/mk/wrapper/cmd-sink-darwin-xlc b/mk/wrapper/cmd-sink-darwin-xlc
new file mode 100644
index 00000000000..dd66dd19583
--- /dev/null
+++ b/mk/wrapper/cmd-sink-darwin-xlc
@@ -0,0 +1,59 @@
+# $NetBSD: cmd-sink-darwin-xlc,v 1.1 2004/12/05 09:29:26 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.
+while ! queue_is_empty cmdbuf; do
+	pop_queue cmdbuf arg
+	$debug_log $wrapperlog "    (cmd-sink-darwin-xlc) pop: $arg"
+	case $arg in
+	##############################################################
+	# xlc doesn't support -install_name, -compatibility_version,
+	# -current_version, so explicitly pass them to the linker with
+	# the next argument.
+	##############################################################
+	-install_name|-compatibility_version|-current_version)
+		pop_queue cmdbuf arg2
+		$debug_log $wrapperlog "    (cmd-sink-darwin-xlc) pop: $arg2"
+		$debug_log $wrapperlog "    (cmd-sink-darwin-xlc) pre: -Wl,$arg2"
+		prepend_queue cmdbuf "-Wl,$arg2"
+		$debug_log $wrapperlog "    (cmd-sink-darwin-xlc) pre: -Wl,$arg"
+		prepend_queue cmdbuf "-Wl,$arg"
+		;;
+	*)
+		. $buildcmd
+		;;
+	esac
+done