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

sync libtool patch

Browse Source
This commit is contained in:
danh 2001-02-20 19:05:04 +00:00
parent 5af793e614
commit 5be9a151e3
2 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
databases/mysql/patches/patch-ltconfig
View File

@ -1,6 +1,6 @@
--- ltconfig.orig Wed Jan 17 04:39:50 2001 --- ltconfig.orig Thu Feb 8 21:12:19 2001
+++ ltconfig Fri Jan 19 12:07:13 2001 +++ ltconfig Tue Feb 20 14:03:16 2001
@@ -1105,6 +1105,9 @@ @@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no with_gnu_ld=no
fi fi
;; ;;
@ -10,7 +10,7 @@
esac esac
@@ -1402,10 +1405,21 @@ @@ -1402,10 +1405,21 @@ else
;; ;;
openbsd*) openbsd*)
@ -19,22 +19,22 @@
hardcode_direct=yes hardcode_direct=yes
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
+ case "$host_os" in + case "$host_os" in
+ openbsd2.[01234567]) + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts' + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='-R$libdir' + hardcode_libdir_flag_spec='-R$libdir'
+ ;; + ;;
+ *) + *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then + if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='${wl}-E'
+ fi + fi
+ ;; + ;;
+ esac + esac
;; ;;
os2*) os2*)
@@ -2022,13 +2036,10 @@ @@ -2022,13 +2036,10 @@ netbsd*)
openbsd*) openbsd*)
version_type=sunos version_type=sunos

38
devel/pth/patches/patch-ltmain.sh
View File

@ -1,6 +1,36 @@
--- ltmain.sh.orig Sat Oct 21 13:54:20 2000 --- ltmain.sh.orig Sat Jul 29 10:51:11 2000
+++ ltmain.sh Sat Oct 21 13:54:11 2000 +++ ltmain.sh Tue Feb 20 14:08:16 2001
@@ -1799,6 +1799,9 @@ @@ -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... # rhapsody is a little odd...
deplibs="$deplibs -framework System" deplibs="$deplibs -framework System"
;; ;;
@ -10,7 +40,7 @@
*) *)
# Add libc to deplibs on all other systems. # Add libc to deplibs on all other systems.
deplibs="$deplibs -lc" deplibs="$deplibs -lc"
@@ -3567,40 +3570,6 @@ @@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode. # Exit here if they wanted silent mode.
test "$show" = : && exit 0 test "$show" = : && exit 0