diff options
| author | tron <tron@pkgsrc.org> | 2007-04-09 22:33:26 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2007-04-09 22:33:26 +0000 |
| commit | aef83eee53cc87f2b9354d639dfe4adb67a6ab66 (patch) | |
| tree | 55357469214756b110d358bdae674b1637f39580 /mk | |
| parent | 87d5f57de5887b0b8aa8fc6e421f0515c168c955 (diff) | |
| download | pkgsrc-aef83eee53cc87f2b9354d639dfe4adb67a6ab66.tar.gz | |
Remove special treatment of "DynaLoader.a" completely. It's not necessary
with current libtool version and breaks the build under Darwin 8.x and
NetBSD 4.0_BETA2.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/cmd-sink-libtool | 17 | ||||
| -rw-r--r-- | mk/wrapper/arg-pp-main | 15 |
2 files changed, 2 insertions, 30 deletions
diff --git a/mk/buildlink3/cmd-sink-libtool b/mk/buildlink3/cmd-sink-libtool index 8012504b28f..e0d336bdbd5 100644 --- a/mk/buildlink3/cmd-sink-libtool +++ b/mk/buildlink3/cmd-sink-libtool @@ -1,4 +1,4 @@ -# $NetBSD: cmd-sink-libtool,v 1.3 2007/03/12 19:19:45 tron Exp $ +# $NetBSD: cmd-sink-libtool,v 1.4 2007/04/09 22:33:26 tron Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -40,21 +40,6 @@ while ! queue_is_empty cmdbuf; do $debug_log $wrapperlog " (cmd-sink-libtool) pop: $arg" case $arg in ############################################################## - # Hardcode a workaround for perl's DynaLoader.a which is - # definitely a PIC code archive, but libtool isn't smart - # enough to realize it. Munge the name into something that - # will make libtool recognize it as a PIC code archive. We - # unmunge it in arg-pp-main so non-libtool wrappers see the - # right thing. - ############################################################## - */DynaLoader.a) - if [ "$OPSYS" != "Darwin" ]; then - arg="${arg%/DynaLoader.a}/libDynaLoader_pic.a" - $debug_log $wrapperlog " (cmd-sink-libtool) to: $arg" - fi - . $buildcmd - ;; - ############################################################## # If we're in "compile" mode, then don't add any linker options # to the command line. ############################################################## diff --git a/mk/wrapper/arg-pp-main b/mk/wrapper/arg-pp-main index 537c812c456..ddfc66d725c 100644 --- a/mk/wrapper/arg-pp-main +++ b/mk/wrapper/arg-pp-main @@ -1,4 +1,4 @@ -# $NetBSD: arg-pp-main,v 1.5 2005/08/05 19:46:41 jlam Exp $ +# $NetBSD: arg-pp-main,v 1.6 2007/04/09 22:33:26 tron Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -36,19 +36,6 @@ case $arg in ###################################################################### -# Hardcode a workaround for perl's DynaLoader.a which is definitely -# a PIC code archive, but libtool isn't smart enough to realize it. -# cmd-sink-libtool munged it into something libtool recognizes, but -# now we need to unmunge it so that the compiler/linker are called -# with the right name for the archive. -###################################################################### -*/libDynaLoader_pic.a) - arg="${arg%/libDynaLoader_pic.a}/DynaLoader.a" - prepend_queue argbuf "$arg" - $debug_log $wrapperlog " (arg-pp-main) pre: $arg" - argmatch=yes - ;; -###################################################################### # Split direct paths to shared libraries into the "-Ldir -llib" # equivalent. ###################################################################### |