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:
brad 2001-02-18 21:06:51 +00:00
parent 4999f8dc78
commit c5d3f01d1c
2 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
audio/wsoundserver/patches/patch-ltconfig
View File

@ -1,19 +1,17 @@
$OpenBSD: patch-ltconfig,v 1.1.1.1 2001/01/09 20:59:36 naddy Exp $ $OpenBSD: patch-ltconfig,v 1.2 2001/02/18 21:06:51 brad Exp $
--- ltconfig.orig Fri Mar 31 22:10:25 2000 --- ltconfig.orig Fri Mar 31 15:10:25 2000
+++ ltconfig Tue Jan 9 20:59:01 2001 +++ ltconfig Sun Feb 18 11:03:22 2001
@@ -1061,7 +1061,10 @@ cygwin* | mingw*) @@ -1061,6 +1061,9 @@
with_gnu_ld=no with_gnu_ld=no
fi fi
;; ;;
-
+openbsd*) +openbsd*)
+ with_gnu_ld=no + with_gnu_ld=no
+ ;; + ;;
+
esac esac
ld_shlibs=yes @@ -1317,10 +1320,21 @@
@@ -1317,10 +1320,18 @@ else
;; ;;
openbsd*) openbsd*)
@ -22,19 +20,22 @@ $OpenBSD: patch-ltconfig,v 1.1.1.1 2001/01/09 20:59:36 naddy Exp $
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
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;; + ;;
+ esac + esac
;; ;;
os2*) os2*)
@@ -1857,13 +1868,10 @@ netbsd*) @@ -1857,13 +1871,10 @@
openbsd*) openbsd*)
version_type=sunos version_type=sunos

48
audio/wsoundserver/patches/patch-ltmain_sh
View File

@ -1,17 +1,46 @@
$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2001/01/09 20:59:36 naddy Exp $ $OpenBSD: patch-ltmain_sh,v 1.2 2001/02/18 21:06:52 brad Exp $
--- ltmain.sh.orig Fri Mar 31 22:10:25 2000 --- ltmain.sh.orig Fri Mar 31 15:10:25 2000
+++ ltmain.sh Tue Jan 9 20:59:01 2001 +++ ltmain.sh Sun Feb 18 11:05:10 2001
@@ -1763,6 +1763,9 @@ compiler." @@ -1054,6 +1054,17 @@
# 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
@@ -1066,6 +1077,10 @@
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -1763,6 +1778,9 @@
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)! # these systems don't actually have a c library (as such)!
;; ;;
+ *-*-openbsd*) + *-*-openbsd*)
+ # do not include libc due to us having libc/libc_r. + # Do not include libc due to us having libc/libc_r.
+ ;; + ;;
*) *)
# Add libc to deplibs on all other systems. # Add libc to deplibs on all other systems.
deplibs="$deplibs -lc" deplibs="$deplibs -lc"
@@ -3437,39 +3440,6 @@ libdir='$install_libdir'\ @@ -3437,40 +3455,6 @@
# Exit here if they wanted silent mode. # Exit here if they wanted silent mode.
test "$show" = : && exit 0 test "$show" = : && exit 0
@ -48,6 +77,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2001/01/09 20:59:36 naddy Exp $
- echo - echo
- echo "See any operating system documentation about shared libraries for" - echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages." - echo "more information, such as the ld(1) and ld.so(8) manual pages."
echo "----------------------------------------------------------------------" - echo "----------------------------------------------------------------------"
exit 0 exit 0
;; ;;