diff options
| author | rillig <rillig@pkgsrc.org> | 2006-11-03 07:28:53 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-11-03 07:28:53 +0000 |
| commit | 0f6d0af4113eb733e18c793d50d79b2746d787b9 (patch) | |
| tree | 1af446675700936389ce5af630069a15184dd0d8 | |
| parent | 450decce9406a78b8f43b4f7705f4d7b96b40ac5 (diff) | |
| download | pkgsrc-0f6d0af4113eb733e18c793d50d79b2746d787b9.tar.gz | |
The Tru64 linker does not know -h ${soname}, only -soname ${soname}.
Patch provided by Hrvoje Habjanic in http://mail-index.netbsd.org/pkgsrc-users/2006/11/02/0003.html
| -rw-r--r-- | mk/wrapper/cmd-sink-osf1-cc | 7 | ||||
| -rw-r--r-- | mk/wrapper/cmd-sink-osf1-ld | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/mk/wrapper/cmd-sink-osf1-cc b/mk/wrapper/cmd-sink-osf1-cc index b67d1da838e..9e4f8509806 100644 --- a/mk/wrapper/cmd-sink-osf1-cc +++ b/mk/wrapper/cmd-sink-osf1-cc @@ -1,4 +1,4 @@ -# $NetBSD: cmd-sink-osf1-cc,v 1.1 2004/11/20 04:37:08 grant Exp $ +# $NetBSD: cmd-sink-osf1-cc,v 1.2 2006/11/03 07:28:53 rillig Exp $ # Empty out the command buffer and build up the command line in $cmd. osf1runpath= @@ -34,6 +34,11 @@ while ! queue_is_empty cmdbuf; do esac $debug_log $wrapperlog " (cmd-sink-osf1-cc) drop: $dir [adding to osf1runpath]" ;; + -Wl,-h*) + arg="-Wl,-soname"${arg#"-Wl,-h"} + $debug_log $wrapperlog " (cmd-sink-osf1-cc) pop: $arg" + . $buildcmd + ;; *) . $buildcmd ;; diff --git a/mk/wrapper/cmd-sink-osf1-ld b/mk/wrapper/cmd-sink-osf1-ld index 1dabe3a196f..2ddaf831bb0 100644 --- a/mk/wrapper/cmd-sink-osf1-ld +++ b/mk/wrapper/cmd-sink-osf1-ld @@ -1,4 +1,4 @@ -# $NetBSD: cmd-sink-osf1-ld,v 1.1 2004/11/20 04:37:08 grant Exp $ +# $NetBSD: cmd-sink-osf1-ld,v 1.2 2006/11/03 07:28:53 rillig Exp $ # Empty out the command buffer and build up the command line in $cmd. osf1runpath= @@ -33,6 +33,11 @@ while ! queue_is_empty cmdbuf; do esac $debug_log $wrapperlog " (cmd-sink-osf1-ld) drop: $dir [adding to osf1runpath]" ;; + -Wl,-h,*) + arg="-Wl,-soname"${arg#"-Wl,-h"} + $debug_log $wrapperlog " (cmd-sink-osf1-ld) pop: $arg" + . $buildcmd + ;; -pthread) arg="-lpthread" $debug_log $wrapperlog " (cmd-sink-osf1-ld) pop: $arg" |