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

I'm not sure if this is the end of all the relink issues

Browse Source 
but this is definitely an improvement on the workaround
currently in place at the moment.

From: Jacob Meuser <jakemsr at jakemsr dot com>
This commit is contained in:
brad 2004-08-05 18:04:55 +00:00
parent c1d9f33e12
commit fa224cdc8f
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
devel/libtool/patches/patch-libltdl_ltmain_sh
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libltdl_ltmain_sh,v 1.2 2004/08/02 15:43:11 brad Exp $
$OpenBSD: patch-libltdl_ltmain_sh,v 1.3 2004/08/05 18:04:55 brad Exp $
--- libltdl/ltmain.sh.orig Sun Apr 11 01:44:45 2004
+++ libltdl/ltmain.sh Mon Aug 2 11:39:48 2004
+++ libltdl/ltmain.sh Tue Aug 3 21:59:58 2004
@@ -2151,10 +2151,17 @@ EOF
absdir="$libdir"
fi
@ -23,15 +23,16 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.2 2004/08/02 15:43:11 brad Exp $
fi # $installed = yes
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -2273,7 +2280,6 @@ EOF
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
fi
# This is a shared library
@@ -5824,40 +5830,6 @@ relink_command=\"$relink_command\""
@@ -2468,7 +2475,7 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes && test -f $libdir/$linklib; then
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
@@ -5824,40 +5831,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS

23
devel/libtool/patches/patch-ltmain_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ltmain_in,v 1.2 2004/08/02 15:43:11 brad Exp $
$OpenBSD: patch-ltmain_in,v 1.3 2004/08/05 18:04:55 brad Exp $
--- ltmain.in.orig Thu Apr 1 22:46:15 2004
+++ ltmain.in Mon Aug 2 11:38:08 2004
+++ ltmain.in Tue Aug 3 21:58:08 2004
@@ -2151,10 +2151,17 @@ EOF
absdir="$libdir"
fi
@ -23,15 +23,16 @@ $OpenBSD: patch-ltmain_in,v 1.2 2004/08/02 15:43:11 brad Exp $
fi # $installed = yes
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -2273,7 +2280,6 @@ EOF
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
fi
# This is a shared library
@@ -5824,40 +5830,6 @@ relink_command=\"$relink_command\""
@@ -2468,7 +2475,7 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes && test -f $libdir/$linklib; then
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
@@ -5824,40 +5831,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS