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

sync libtool patches

Browse Source
This commit is contained in:
danh 2001-02-19 16:16:14 +00:00
parent 8c142652a2
commit 1da9a04304
2 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
net/ucd-snmp/patches/patch-ltconfig
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ltconfig,v 1.1 2001/01/05 09:19:47 danh Exp $
--- ltconfig.orig Sat Dec 23 14:34:57 2000
+++ ltconfig Sat Dec 23 14:38:16 2000
$OpenBSD: patch-ltconfig,v 1.2 2001/02/19 16:16:14 danh Exp $
--- ltconfig.orig Wed Apr 26 17:15:40 2000
+++ ltconfig Mon Feb 19 10:49:09 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
@ -11,7 +11,7 @@ $OpenBSD: patch-ltconfig,v 1.1 2001/01/05 09:19:47 danh Exp $
esac
@@ -1396,10 +1399,18 @@ else
@@ -1396,10 +1399,21 @@ else
;;
openbsd*)
@ -20,19 +20,22 @@ $OpenBSD: patch-ltconfig,v 1.1 2001/01/05 09:19:47 danh Exp $
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd2.[01234567])
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ 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'
+ ;;
+ 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
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -1997,13 +2008,10 @@ netbsd*)
@@ -1997,13 +2011,10 @@ netbsd*)
openbsd*)
version_type=sunos

39
net/ucd-snmp/patches/patch-ltmain_sh
View File

@ -1,7 +1,36 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2001/01/05 09:19:47 danh Exp $
--- ltmain.sh.orig Sat Dec 23 14:35:02 2000
+++ ltmain.sh Sat Dec 23 14:41:28 2000
@@ -1795,6 +1795,9 @@ compiler."
$OpenBSD: patch-ltmain_sh,v 1.2 2001/02/19 16:16:14 danh Exp $
--- ltmain.sh.orig Tue May 9 14:30:41 2000
+++ ltmain.sh Mon Feb 19 10:53:33 2001
@@ -1079,6 +1079,17 @@ compiler."
# These systems don't actually have c library (as such)
continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
+ esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue;
+ ;;
esac
elif test "$arg" = "-lm"; then
case "$host" in
@@ -1091,6 +1102,10 @@ compiler."
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1795,6 +1810,9 @@ compiler."
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
@ -11,7 +40,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1 2001/01/05 09:19:47 danh Exp $
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3555,40 +3558,6 @@ libdir='$install_libdir'\
@@ -3555,40 +3573,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode.
test "$show" = : && exit 0