96 lines
2.4 KiB
Text
96 lines
2.4 KiB
Text
$NetBSD: patch-ac,v 1.34 2014/12/02 10:56:24 joerg Exp $
|
|
|
|
--- libltdl/config/ltmain.sh.orig Mon Oct 17 10:19:11 2011
|
|
+++ libltdl/config/ltmain.sh
|
|
@@ -133,8 +133,9 @@ $lt_unset CDPATH
|
|
# function.
|
|
progpath="$0"
|
|
|
|
-
|
|
-
|
|
+unset CP
|
|
+unset MV
|
|
+unset RM
|
|
: ${CP="cp -f"}
|
|
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
|
|
: ${MAKE="make"}
|
|
@@ -6899,7 +6900,11 @@ func_mode_link ()
|
|
# Finalize command for both is simple: just hardcode it.
|
|
if test "$hardcode_direct" = yes &&
|
|
test "$hardcode_direct_absolute" = no; then
|
|
- add="$libdir/$linklib"
|
|
+ if test -f "$inst_prefix_dir$libdir/$linklib"; then
|
|
+ add="$inst_prefix_dir$libdir/$linklib"
|
|
+ else
|
|
+ add="$libdir/$linklib"
|
|
+ fi
|
|
elif test "$hardcode_minus_L" = yes; then
|
|
add_dir="-L$libdir"
|
|
add="-l$name"
|
|
@@ -7391,6 +7396,7 @@ func_mode_link ()
|
|
# Calculate the version variables.
|
|
major=
|
|
versuffix=
|
|
+ versuffix2=
|
|
verstring=
|
|
case $version_type in
|
|
none) ;;
|
|
@@ -7451,6 +7457,7 @@ func_mode_link ()
|
|
func_arith $current - $age
|
|
major=.$func_arith_result
|
|
versuffix="$major.$age.$revision"
|
|
+ versuffix2="$major.$age"
|
|
;;
|
|
|
|
osf)
|
|
@@ -7511,8 +7518,10 @@ func_mode_link ()
|
|
esac
|
|
if test "$need_version" = no; then
|
|
versuffix=
|
|
+ versuffix2=
|
|
else
|
|
versuffix=".0.0"
|
|
+ versuffix2=".0.0"
|
|
fi
|
|
fi
|
|
|
|
@@ -7520,6 +7529,7 @@ func_mode_link ()
|
|
if test "$avoid_version" = yes && test "$need_version" = no; then
|
|
major=
|
|
versuffix=
|
|
+ versuffix2=
|
|
verstring=""
|
|
fi
|
|
|
|
@@ -7630,7 +7640,7 @@ func_mode_link ()
|
|
*-*-netbsd*)
|
|
# Don't link with libc until the a.out ld.so is fixed.
|
|
;;
|
|
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
|
|
+ *-*-openbsd* | *-*-mirbsd* | *-*-freebsd* | *-*-dragonfly*)
|
|
# Do not include libc due to us having libc/libc_r.
|
|
;;
|
|
*-*-sco3.2v5* | *-*-sco5v6*)
|
|
@@ -7653,12 +7663,14 @@ func_mode_link ()
|
|
libname_save=$libname
|
|
release_save=$release
|
|
versuffix_save=$versuffix
|
|
+ versuffix2_save=$versuffix2
|
|
major_save=$major
|
|
# I'm not sure if I'm treating the release correctly. I think
|
|
# release should show up in the -l (ie -lgmp5) so we don't want to
|
|
# add it in twice. Is that correct?
|
|
release=""
|
|
versuffix=""
|
|
+ versuffix2=""
|
|
major=""
|
|
newdeplibs=
|
|
droppeddeps=no
|
|
@@ -7935,6 +7947,7 @@ EOF
|
|
;;
|
|
esac
|
|
versuffix=$versuffix_save
|
|
+ versuffix2=$versuffix2_save
|
|
major=$major_save
|
|
release=$release_save
|
|
libname=$libname_save
|