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 18:40:33 +00:00
parent 48b9391566
commit e3e7dbad90
6 changed files with 208 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
devel/mm/patches/patch-ltconfig
View File

@ -1,6 +1,47 @@
--- ltconfig.orig Sat Jul 1 18:12:07 2000
+++ ltconfig Sat Jul 1 18:12:40 2000
@@ -2028,6 +2028,7 @@
--- ltconfig.orig Sat Jul 1 10:13:38 2000
+++ ltconfig Tue Feb 20 13:48:53 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -1402,10 +1405,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*)
@@ -2021,13 +2035,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

48
devel/mm/patches/patch-ltmain.sh
View File

@ -1,6 +1,46 @@
--- ltmain.sh.orig Sat Jul 1 18:11:37 2000
+++ ltmain.sh Sat Jul 1 18:11:51 2000
@@ -2623,7 +2623,7 @@
--- ltmain.sh.orig Sat Jul 1 10:13:38 2000
+++ ltmain.sh Tue Feb 20 13:50:18 2001
@@ -1079,7 +1079,18 @@ 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
*-*-cygwin* | *-*-beos*)
@@ -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)!
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*-*-rhapsody*)
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
@@ -2623,7 +2641,7 @@ static const void *lt_preloaded_setup()
# linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
@ -9,7 +49,7 @@
case "$compile_command " in
*" -static "*) ;;
*) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
@@ -3567,40 +3567,6 @@
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode.
test "$show" = : && exit 0

26
misc/libutf8/patches/patch-autoconf_ltconfig
View File

@ -1,7 +1,18 @@
$OpenBSD: patch-autoconf_ltconfig,v 1.1.1.1 2001/02/08 20:05:22 todd Exp $
--- autoconf/ltconfig.orig Thu Feb 1 11:49:59 2001
+++ autoconf/ltconfig Thu Feb 1 11:53:47 2001
@@ -826,10 +826,18 @@ else
$OpenBSD: patch-autoconf_ltconfig,v 1.2 2001/02/20 18:40:33 danh Exp $
--- autoconf/ltconfig.orig Tue Jul 4 04:38:15 2000
+++ autoconf/ltconfig Tue Feb 20 13:34:50 2001
@@ -707,6 +707,10 @@ amigaos* | beos* | sunos4*)
# On these operating systems, we should treat GNU ld like the system ld.
gnu_ld_acts_native=yes
;;
+openbsd*)
+ gnu_ld_acts_native=no
+ with_gnu_ld=no
+ ;;
*)
gnu_ld_acts_native=no
;;
@@ -826,10 +830,21 @@ else
;;
openbsd*)
@ -10,19 +21,22 @@ $OpenBSD: patch-autoconf_ltconfig,v 1.1.1.1 2001/02/08 20:05:22 todd Exp $
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd2.[01234567])
+ 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*)
@@ -1199,11 +1207,19 @@ linux-gnu*)
@@ -1199,11 +1214,19 @@ linux-gnu*)
fi
;;

61
misc/libutf8/patches/patch-autoconf_ltmain_sh
View File

@ -1,16 +1,63 @@
$OpenBSD: patch-autoconf_ltmain_sh,v 1.1.1.1 2001/02/08 20:05:22 todd Exp $
--- autoconf/ltmain.sh.orig Thu Feb 1 11:50:04 2001
+++ autoconf/ltmain.sh Thu Feb 1 11:55:51 2001
@@ -1004,7 +1004,7 @@ if test -z "$show_help"; then
$OpenBSD: patch-autoconf_ltmain_sh,v 1.2 2001/02/20 18:40:33 danh Exp $
--- autoconf/ltmain.sh.orig Mon Dec 21 19:28:47 1998
+++ autoconf/ltmain.sh Tue Feb 20 13:38:20 2001
@@ -507,7 +507,28 @@ if test -z "$show_help"; then
deplibs="$deplibs $arg"
;;
# Add libc to deplibs on all systems.
- -l*) deplibs="$deplibs $arg" ;;
+ -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"
+ ;;
-no-undefined)
allow_undefined=no
@@ -1002,9 +1023,23 @@ if test -z "$show_help"; then
allow_undefined_flag="$no_undefined_flag"
fi
- # Add libc to deplibs on all systems.
dependency_libs="$deplibs"
- deplibs="$deplibs -lc"
+ deplibs="$deplibs"
+ case "$host" in
+ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
+ # these systems don't actually have a c library (as such)!
+ ;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
+ *-*-rhapsody*)
+ # rhapsody is a little odd...
+ deplibs="$deplibs -framework System"
+ ;;
+ *)
+ # Add libc to deplibs on all other systems.
+ deplibs="$deplibs -lc"
+ ;;
+ esac
if test "$build_libtool_libs" = yes; then
# Get the real and link names of the library.
@@ -2025,37 +2025,6 @@ libdir='$install_libdir'\
@@ -2025,37 +2060,6 @@ libdir='$install_libdir'\
done
fi

21
security/mhash/patches/patch-ltconfig
View File

@ -1,6 +1,6 @@
--- ltconfig.orig Tue Oct 24 19:08:34 2000
+++ ltconfig Mon Nov 20 14:08:15 2000
@@ -1105,6 +1105,9 @@
+++ ltconfig Tue Feb 20 13:44:30 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
;;
@ -10,7 +10,7 @@
esac
@@ -1402,10 +1405,18 @@
@@ -1402,10 +1405,21 @@ else
;;
openbsd*)
@ -19,19 +19,22 @@
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*)
@@ -2022,13 +2033,10 @@
@@ -2022,13 +2036,10 @@ netbsd*)
openbsd*)
version_type=sunos

38
security/mhash/patches/patch-ltmain.sh
View File

@ -1,6 +1,36 @@
--- ltmain.sh.orig Sat Oct 21 13:54:20 2000
+++ ltmain.sh Sat Oct 21 13:54:11 2000
@@ -1799,6 +1799,9 @@
--- ltmain.sh.orig Tue Oct 24 19:08:34 2000
+++ ltmain.sh Tue Feb 20 13:45:34 2001
@@ -1079,7 +1079,18 @@ 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
*-*-cygwin* | *-*-beos*)
@@ -1091,6 +1102,10 @@ compiler."
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1799,6 +1814,9 @@ compiler."
# rhapsody is a little odd...
deplibs="$deplibs -framework System"
;;
@ -10,7 +40,7 @@
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3567,40 +3570,6 @@
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode.
test "$show" = : && exit 0