kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

*SIGH*

Browse source 
The previous patch could cause problems in a couple of oddball cases.
So, set need_version=yes for a.out, and hack avoid-version so it works on
a.out platforms.
This commit is contained in:
mycroft 2000-11-26 11:22:40 +00:00
parent 5847fa1f03
commit c0f325e33c
3 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
devel/libtool/files/patch-sum
View file

@ -1,5 +1,5 @@
$NetBSD: patch-sum,v 1.14 2000/11/26 11:04:18 mycroft Exp $
$NetBSD: patch-sum,v 1.15 2000/11/26 11:22:40 mycroft Exp $
MD5 (patch-aa) = 0eef20991e5c9fd2a10dbd1f5623fb9f
MD5 (patch-ab) = b550fbb6345a031c6ea34ee66ec257e1
MD5 (patch-aa) = e796259223023b29dd376ee2dae1fc6c
MD5 (patch-ab) = 01ddbafc3e9b794042542862b91948f2
MD5 (patch-ac) = be7e8b63e245f3d9ba4e19c5fd928d00

15
devel/libtool/patches/patch-aa
View file

@ -1,7 +1,7 @@
$NetBSD: patch-aa,v 1.16 2000/11/26 11:03:42 mycroft Exp $
$NetBSD: patch-aa,v 1.17 2000/11/26 11:22:40 mycroft Exp $
--- ltconfig.in.orig Sat May 27 01:58:57 2000
+++ ltconfig.in Sun Nov 26 10:55:47 2000
+++ ltconfig.in Sun Nov 26 11:19:29 2000
@@ -1194,11 +1194,17 @@
netbsd*)
@ -46,11 +46,9 @@ $NetBSD: patch-aa,v 1.16 2000/11/26 11:03:42 mycroft Exp $
hardcode_direct=yes
hardcode_shlibpath_var=no
;;
@@ -2007,11 +2021,18 @@
@@ -2008,13 +2022,21 @@
netbsd*)
version_type=sunos
+ need_version=no
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ deplibs_check_method='file_magic NetBSD/[a-z0-9]* demand paged shared library'
+ file_magic_cmd=/usr/bin/file
@ -58,6 +56,7 @@ $NetBSD: patch-aa,v 1.16 2000/11/26 11:03:42 mycroft Exp $
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
+ need_version=yes
else
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ file_magic_cmd=/usr/bin/file
@ -65,7 +64,11 @@ $NetBSD: patch-aa,v 1.16 2000/11/26 11:03:42 mycroft 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,7 +2090,7 @@
+ need_version=no
fi
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -2069,7 +2091,7 @@
;;
solaris*)

27
devel/libtool/patches/patch-ab
View file

@ -1,7 +1,7 @@
$NetBSD: patch-ab,v 1.11 2000/09/14 10:20:46 skrll Exp $
$NetBSD: patch-ab,v 1.12 2000/11/26 11:22:40 mycroft Exp $
--- ltmain.in.orig Sat May 27 02:53:15 2000
+++ ltmain.in
--- ltmain.in.orig Sat May 27 01:53:15 2000
+++ ltmain.in Sun Nov 26 11:19:57 2000
@@ -819,6 +819,7 @@
old_convenience=
deplibs=
@ -36,7 +36,26 @@ $NetBSD: patch-ab,v 1.11 2000/09/14 10:20:46 skrll Exp $
# Some other compiler flag.
-* | +*)
# Unknown arguments in both finalize_command and compile_command need
@@ -2146,6 +2166,7 @@
@@ -1772,7 +1792,7 @@
fi
# Remove version info from name if versioning should be avoided
- if test "$avoid_version" = yes && test "$need_version" = no; then
+ if test "$avoid_version" = yes; then
major=
versuffix=
verstring=""
@@ -1799,6 +1819,9 @@
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
;;
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -2146,6 +2169,7 @@
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
linkopts="$linkopts $flag"