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

one last sync of our libtool 1.3.x patches hopefully before bringing in

Browse Source 
libtool 1.4.
This commit is contained in:
brad 2001-10-02 13:47:56 +00:00
parent 054698f238
commit 24e8d6275d
3 changed files with 34 additions and 22 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.26 2001/08/21 02:41:15 brad Exp $
# $OpenBSD: Makefile,v 1.27 2001/10/02 13:47:56 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}p2
PKGNAME= ${DISTNAME}p3
CATEGORIES= devel
NEED_VERSION= 1.435
NEED_VERSION= 1.460
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool

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

@ -1,6 +1,6 @@
$OpenBSD: patch-ltconfig,v 1.5 2001/08/27 02:42:12 brad Exp $
$OpenBSD: patch-ltconfig,v 1.6 2001/10/02 13:47:56 brad Exp $
--- ltconfig.orig Sat May 27 07:15:00 2000
+++ ltconfig Sun Aug 26 22:31:14 2001
+++ ltconfig Tue Oct 2 09:14:18 2001
@@ -501,7 +501,14 @@ fi
if test -n "$RANLIB"; then
@ -28,7 +28,7 @@ $OpenBSD: patch-ltconfig,v 1.5 2001/08/27 02:42:12 brad Exp $
esac
ld_shlibs=yes
@@ -1402,10 +1411,21 @@ else
@@ -1402,10 +1411,24 @@ else
;;
openbsd*)
@ -36,23 +36,26 @@ $OpenBSD: patch-ltconfig,v 1.5 2001/08/27 02:42:12 brad Exp $
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;;
+ esac
+ fi
;;
os2*)
@@ -2021,9 +2041,23 @@ netbsd*)
@@ -2021,9 +2044,25 @@ netbsd*)
openbsd*)
version_type=sunos
@ -61,6 +64,8 @@ $OpenBSD: patch-ltconfig,v 1.5 2001/08/27 02:42:12 brad Exp $
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ sys_lib_search_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

21
devel/libtool/patches/patch-ltmain_sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2001/02/20 18:26:38 danh Exp $
$OpenBSD: patch-ltmain_sh,v 1.2 2001/10/02 13:47:56 brad Exp $
--- ltmain.sh.orig Sat May 27 07:15:01 2000
+++ ltmain.sh Tue Feb 20 13:25:14 2001
+++ ltmain.sh Tue Oct 2 09:05:28 2001
@@ -1079,6 +1079,17 @@ compiler."
# These systems don't actually have c library (as such)
continue
@ -19,18 +19,25 @@ $OpenBSD: patch-ltmain_sh,v 1.1 2001/02/20 18:26:38 danh Exp $
esac
elif test "$arg" = "-lm"; then
case "$host" in
@@ -1091,6 +1102,10 @@ compiler."
@@ -1091,6 +1102,17 @@ compiler."
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ -pthread)
+ case $host in
+ *-*-openbsd*)
+ deplibs="$deplibs $arg"
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ ;;
+
-module)
module=yes
continue
@@ -1795,6 +1810,9 @@ compiler."
@@ -1795,6 +1817,9 @@ compiler."
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
@ -40,7 +47,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1 2001/02/20 18:26:38 danh Exp $
*-*-rhapsody*)
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
@@ -3567,40 +3592,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode.
test "$show" = : && exit 0