cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- teach libtool about the new behavior of LD_LIBRARY_PATH on our ELF archs

Browse Source 
for the next release
- bump PKGNAME
This commit is contained in:
brad 2001-08-21 02:41:15 +00:00
parent 7c69913d42
commit 54417ac024
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/libtool/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.25 2001/08/04 03:28:42 brad Exp $
# $OpenBSD: Makefile,v 1.26 2001/08/21 02:41:15 brad Exp $
# $FreeBSD: Makefile,v 1.2 1998/09/23 16:15:53 vanilla Exp $
COMMENT= "generic shared library support script"
DISTNAME= libtool-1.3.5
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= devel
NEED_VERSION= 1.413
NEED_VERSION= 1.435
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool

29
devel/libtool/patches/patch-ltconfig
View File

@ -1,21 +1,23 @@
$OpenBSD: patch-ltconfig,v 1.3 2001/08/20 21:53:03 espie Exp $
--- ltconfig.orig Sat May 27 13:15:00 2000
+++ ltconfig Mon Aug 20 19:17:24 2001
@@ -501,7 +501,12 @@ fi
$OpenBSD: patch-ltconfig,v 1.4 2001/08/21 02:41:15 brad Exp $
--- ltconfig.orig Sat May 27 07:15:00 2000
+++ ltconfig Mon Aug 20 22:11:09 2001
@@ -501,7 +501,14 @@ fi
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds";;
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds";;
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
@@ -1105,6 +1110,9 @@ cygwin* | mingw*)
@@ -1105,6 +1112,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
@ -25,7 +27,7 @@ $OpenBSD: patch-ltconfig,v 1.3 2001/08/20 21:53:03 espie Exp $
esac
@@ -1402,10 +1410,21 @@ else
@@ -1402,10 +1412,21 @@ else
;;
openbsd*)
@ -49,7 +51,7 @@ $OpenBSD: patch-ltconfig,v 1.3 2001/08/20 21:53:03 espie Exp $
;;
os2*)
@@ -2021,9 +2040,16 @@ netbsd*)
@@ -2021,9 +2042,23 @@ netbsd*)
openbsd*)
version_type=sunos
@ -62,7 +64,14 @@ $OpenBSD: patch-ltconfig,v 1.3 2001/08/20 21:53:03 espie Exp $
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ shlibpath_overrides_runpath=no
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes