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

- bump PKGNAME

Browse Source 
- use better check for ELF which uses cpp-predefined __ELF__ symbol
- allow for shared objects without "lib" prefix and non-versioned (both
for "modules")
- add proper interlibrary dependency checking
--
Porters please sync libtool patches with this and make sure to test to
make sure there is no breakage with each port.
This commit is contained in:
brad 2001-08-04 03:28:42 +00:00
parent bdb223791a
commit badbf7a2b6
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/libtool/Makefile
View File

@ -1,11 +1,12 @@
# $OpenBSD: Makefile,v 1.24 2001/04/05 20:23:20 brad Exp $
# $OpenBSD: Makefile,v 1.25 2001/08/04 03:28:42 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
CATEGORIES= devel
NEED_VERSION= 1.384
NEED_VERSION= 1.413
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool

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

@ -1,6 +1,6 @@
$OpenBSD: patch-ltconfig,v 1.1 2001/02/20 18:26:38 danh Exp $
$OpenBSD: patch-ltconfig,v 1.2 2001/08/04 03:28:42 brad Exp $
--- ltconfig.orig Sat May 27 07:15:00 2000
+++ ltconfig Tue Feb 20 13:25:13 2001
+++ ltconfig Fri Aug 3 22:27:08 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
@ -27,7 +27,7 @@ $OpenBSD: patch-ltconfig,v 1.1 2001/02/20 18:26:38 danh Exp $
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" -o "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
@ -35,18 +35,23 @@ $OpenBSD: patch-ltconfig,v 1.1 2001/02/20 18:26:38 danh Exp $
;;
os2*)
@@ -2021,13 +2035,10 @@ netbsd*)
@@ -2021,9 +2035,16 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
+ need_lib_prefix=no
+ need_version=no
+ file_magic_cmd=/usr/bin/file
+ 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
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
+ deplibs_check_method='pass_all'
;;
os2*)