diff options
author | skrll <skrll@pkgsrc.org> | 2000-09-14 10:20:46 +0000 |
---|---|---|
committer | skrll <skrll@pkgsrc.org> | 2000-09-14 10:20:46 +0000 |
commit | ab3ca0343153dd1528ad0cf729fc8f122e28c0f4 (patch) | |
tree | 7992f9bf69f6fffd20fd4362719f4b4913f0f536 | |
parent | 2bb5b87d825d5ee14d66b47fdc988742b6926395 (diff) | |
download | pkgsrc-ab3ca0343153dd1528ad0cf729fc8f122e28c0f4.tar.gz |
Depreciate use of cc -shared as test and cc as linker in a.out case.
Bump to nb5.
This fixes PR/10908.
-rw-r--r-- | devel/libtool/Makefile | 4 | ||||
-rw-r--r-- | devel/libtool/files/patch-sum | 8 | ||||
-rw-r--r-- | devel/libtool/patches/patch-aa | 45 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ab | 6 | ||||
-rw-r--r-- | devel/libtool/patches/patch-ac | 43 |
5 files changed, 48 insertions, 58 deletions
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile index 8535f9482a1..ae0bd518930 100644 --- a/devel/libtool/Makefile +++ b/devel/libtool/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2000/06/29 08:06:05 skrll Exp $ +# $NetBSD: Makefile,v 1.20 2000/09/14 10:20:46 skrll Exp $ # DISTNAME= libtool-1.3.5 -PKGNAME= libtool-1.3.5nb4 +PKGNAME= libtool-1.3.5nb5 CATEGORIES= devel pkgtools MASTER_SITES= ${MASTER_SITE_GNU:=libtool/} diff --git a/devel/libtool/files/patch-sum b/devel/libtool/files/patch-sum index d2a583e907d..aa13a423330 100644 --- a/devel/libtool/files/patch-sum +++ b/devel/libtool/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.10 2000/08/26 07:35:18 veego Exp $ +$NetBSD: patch-sum,v 1.11 2000/09/14 10:20:46 skrll Exp $ -MD5 (patch-aa) = d8fdf5274159e41712af05f3cf9cd004 -MD5 (patch-ab) = d7098941b9d7b79822bb02cfef632b4b -MD5 (patch-ac) = 6d9649b0c245e4de2571a68b3cd246ef +MD5 (patch-aa) = 40127f6b3bfe5747ccb450017417487c +MD5 (patch-ab) = b550fbb6345a031c6ea34ee66ec257e1 +MD5 (patch-ac) = be7e8b63e245f3d9ba4e19c5fd928d00 diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa index 2064fc192da..a3fcc8992ba 100644 --- a/devel/libtool/patches/patch-aa +++ b/devel/libtool/patches/patch-aa @@ -1,22 +1,18 @@ -$NetBSD: patch-aa,v 1.12 2000/08/26 07:35:19 veego Exp $ ---- ./ltconfig.in.orig Sat May 27 02:58:57 2000 -+++ ./ltconfig.in Thu Jun 29 09:00:00 2000 -@@ -1194,11 +1194,20 @@ +$NetBSD: patch-aa,v 1.13 2000/09/14 10:20:46 skrll Exp $ + +--- ltconfig.in.orig Sat May 27 02:58:57 2000 ++++ ltconfig.in +@@ -1194,11 +1194,15 @@ netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ if $CC -dumpspecs | grep 'c++rt0' >/dev/null; then -+ # This a.out compiler supports the -shared option -+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $wllinkopts' -+ else -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -+ wlarc= -+ if test -f /usr/lib/c++rt0.o; then -+ # Add in C++ constructor/destructor support -+ archive_cmds="$archive_cmds /usr/lib/c++rt0.o" -+ fi ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' ++ wlarc= ++ if test -f /usr/lib/c++rt0.o; then ++ # Add in C++ constructor/destructor support ++ archive_cmds="$archive_cmds /usr/lib/c++rt0.o" + fi else - archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib' @@ -26,21 +22,16 @@ $NetBSD: patch-aa,v 1.12 2000/08/26 07:35:19 veego Exp $ fi ;; -@@ -1392,9 +1401,22 @@ +@@ -1392,9 +1396,17 @@ netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' # a.out -+ if $CC -dumpspecs | grep 'c++rt0' > /dev/null; then -+ # This a.out compiler supports the -shared option -+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $wllinkopts' -+ else -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' -+ wl= -+ if test -f /usr/lib/c++rt0.o; then -+ # Add in C++ constructor/destructor support -+ archive_cmds="$archive_cmds /usr/lib/c++rt0.o" -+ fi ++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' ++ wl= ++ if test -f /usr/lib/c++rt0.o; then ++ # Add in C++ constructor/destructor support ++ archive_cmds="$archive_cmds /usr/lib/c++rt0.o" + fi else + # I don't think there are any ELF toolchains with non-gnu ld. @@ -50,7 +41,7 @@ $NetBSD: patch-aa,v 1.12 2000/08/26 07:35:19 veego Exp $ fi hardcode_libdir_flag_spec='${wl}-R$libdir' hardcode_direct=yes -@@ -2012,6 +2034,9 @@ +@@ -2012,6 +2024,9 @@ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else @@ -60,7 +51,7 @@ $NetBSD: patch-aa,v 1.12 2000/08/26 07:35:19 veego Exp $ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so' soname_spec='${libname}${release}.so$major' dynamic_linker='NetBSD ld.elf_so' -@@ -2069,6 +2094,6 @@ +@@ -2069,7 +2084,7 @@ ;; solaris*) diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab index 41494f63de0..ebf3adbbc20 100644 --- a/devel/libtool/patches/patch-ab +++ b/devel/libtool/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.10 2000/06/04 17:56:17 rh Exp $ +$NetBSD: patch-ab,v 1.11 2000/09/14 10:20:46 skrll Exp $ ---- ltmain.in.orig Sat May 27 03:53:15 2000 -+++ ltmain.in Sun Jun 4 19:33:08 2000 +--- ltmain.in.orig Sat May 27 02:53:15 2000 ++++ ltmain.in @@ -819,6 +819,7 @@ old_convenience= deplibs= diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac index c4a5dc20888..4f4a56b0d7b 100644 --- a/devel/libtool/patches/patch-ac +++ b/devel/libtool/patches/patch-ac @@ -1,22 +1,21 @@ -$NetBSD: patch-ac,v 1.1 2000/08/01 19:13:07 jun Exp $ -*** config.guess.orig Sat May 27 02:30:02 2000 ---- config.guess Wed Aug 2 03:14:25 2000 -*************** -*** 78,89 **** ---- 78,93 ---- - # Determine the machine/vendor (is the vendor relevant). - case "${UNAME_MACHINE}" in - amiga) machine=m68k-cbm ;; -+ arc) machine=mipsel-unknown ;; - arm32) machine=arm-unknown ;; - atari*) machine=m68k-atari ;; -+ cobalt) machine=mipsel-unknown ;; - sun3*) machine=m68k-sun ;; - mac68k) machine=m68k-apple ;; - macppc) machine=powerpc-apple ;; - hp3[0-9][05]) machine=m68k-hp ;; -+ hpcmips) machine=mipsel-unknown ;; -+ pmax) machine=mipsel-unknown ;; - ibmrt|romp-ibm) machine=romp-ibm ;; - *) machine=${UNAME_MACHINE}-unknown ;; - esac +$NetBSD: patch-ac,v 1.2 2000/09/14 10:20:46 skrll Exp $ + +--- config.guess.orig Fri May 26 18:30:02 2000 ++++ config.guess +@@ -78,12 +78,16 @@ + # Determine the machine/vendor (is the vendor relevant). + case "${UNAME_MACHINE}" in + amiga) machine=m68k-cbm ;; ++ arc) machine=mipsel-unknown ;; + arm32) machine=arm-unknown ;; + atari*) machine=m68k-atari ;; ++ cobalt) machine=mipsel-unknown ;; + sun3*) machine=m68k-sun ;; + mac68k) machine=m68k-apple ;; + macppc) machine=powerpc-apple ;; + hp3[0-9][05]) machine=m68k-hp ;; ++ hpcmips) machine=mipsel-unknown ;; ++ pmax) machine=mipsel-unknown ;; + ibmrt|romp-ibm) machine=romp-ibm ;; + *) machine=${UNAME_MACHINE}-unknown ;; + esac |