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

Second half of messed up ORBit2 update.

Browse Source
This commit is contained in:
marcm 2003-08-06 15:39:17 +00:00
parent da91799499
commit 726029264c
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
devel/ORBit2/patches/patch-configure Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-configure,v 1.3 2003/08/06 15:39:17 marcm Exp $
--- configure.orig 2003-07-29 23:12:34.000000000 -0700
+++ configure 2003-07-29 23:12:57.000000000 -0700
@@ -5149,7 +5149,7 @@ else
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
@@ -5159,7 +5159,7 @@ else
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac

29
devel/ORBit2/patches/patch-ltmain_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain_sh,v 1.2 2003/06/12 19:35:56 marcm Exp $
--- ltmain.sh.orig Fri Mar 14 07:58:31 2003
+++ ltmain.sh Fri Apr 4 22:00:29 2003
@@ -1082,6 +1082,17 @@ compiler."
$OpenBSD: patch-ltmain_sh,v 1.3 2003/08/06 15:39:17 marcm Exp $
--- ltmain.sh.orig 2003-07-15 04:00:54.000000000 -0700
+++ ltmain.sh 2003-07-29 23:23:50.000000000 -0700
@@ -1073,6 +1073,17 @@ compiler."
continue
;;
@ -19,17 +19,27 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2003/06/12 19:35:56 marcm Exp $
-module)
module=yes
continue
@@ -1522,6 +1533,9 @@ compiler."
@@ -1530,6 +1541,19 @@ compiler."
fi
continue
;;
+ -pthread)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ newdependency_libs="$deplib $newdependency_libs"
+ ;;
+ prog)
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ ;;
+ esac
+ continue
+ ;;
%DEPLIBS%)
alldeplibs=yes
continue
@@ -1767,11 +1781,6 @@ compiler."
@@ -1775,10 +1799,6 @@ compiler."
continue
fi
@ -37,13 +47,12 @@ $OpenBSD: patch-ltmain_sh,v 1.2 2003/06/12 19:35:56 marcm Exp $
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names
@@ -4575,40 +4584,6 @@ relink_command=\"$relink_command\""
@@ -4526,40 +4546,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
test "$show" = : && exit 0
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"