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-20 20:16:52 +00:00
parent 5be9a151e3
commit 0df4d2cac2
2 changed files with 86 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
misc/xdelta/patches/patch-ltconfig
View File

@ -1,7 +1,49 @@
$OpenBSD: patch-ltconfig,v 1.1 2000/10/31 15:20:18 espie Exp $
--- ltconfig.orig Sat Apr 10 02:58:53 1999
+++ ltconfig Mon Oct 30 15:57:26 2000
@@ -1796,6 +1796,7 @@ openbsd*)
$OpenBSD: patch-ltconfig,v 1.2 2001/02/20 20:16:52 danh Exp $
--- ltconfig.orig Fri Apr 9 20:58:53 1999
+++ ltconfig Tue Feb 20 15:15:26 2001
@@ -1031,6 +1031,10 @@ freebsd2* | sunos4*)
exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
+
esac
ld_shlibs=yes
@@ -1262,10 +1266,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ 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 [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -1789,13 +1804,10 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH

44
misc/xdelta/patches/patch-ltmain_sh
View File

@ -1,7 +1,43 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2000/10/31 15:20:18 espie Exp $
--- ltmain.sh.orig Sat Apr 10 02:58:53 1999
+++ ltmain.sh Mon Oct 30 15:57:26 2000
@@ -3326,40 +3326,6 @@ libdir='$install_libdir'\
$OpenBSD: patch-ltmain_sh,v 1.2 2001/02/20 20:16:52 danh Exp $
--- ltmain.sh.orig Fri Apr 9 20:58:53 1999
+++ ltmain.sh Tue Feb 20 15:16:34 2001
@@ -1010,6 +1010,25 @@ compiler."
;;
-l*)
+ if test "$arg" = "-lc"; then
+ case "$host" in
+ *-*-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
+ fi
+ deplibs="$deplibs $arg"
+ ;;
+
+ -?thread)
deplibs="$deplibs $arg"
;;
@@ -1702,6 +1721,9 @@ compiler."
*-*-cygwin* | *-*-mingw* | *-*-os2*)
# these systems don't actually have a c library (as such)!
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3326,40 +3348,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode.
test "$show" = : && exit 0