00697eb0c6
Changes since 2.4.2 are too numerous to mention, with over 4,700 lines in the ChangeLog file. However, this release does at least fix a large number of build failures on SmartOS, and doesn't appear to cause any obvious regressions in bulk builds performed by Joerg and myself. Some pkgsrc cleanups while here, including merging the MirBSD patches correctly. It couldn't be made much clearer how to properly integrate patches here to ensure they are not lost. Next time you might not be so fortunate!
96 lines
2.6 KiB
Text
96 lines
2.6 KiB
Text
$NetBSD: manual-ltmain.in,v 1.1 2017/03/06 16:14:07 jperkin Exp $
|
|
|
|
Handle versuffix2 for mirbsd/midnightbsd.
|
|
Avoid empty relink_command.
|
|
|
|
--- build-aux/ltmain.in.orig 2015-02-06 12:57:56.000000000 +0000
|
|
+++ build-aux/ltmain.in
|
|
@@ -6430,7 +6430,11 @@ func_mode_link ()
|
|
# Finalize command for both is simple: just hardcode it.
|
|
if test yes = "$hardcode_direct" &&
|
|
test no = "$hardcode_direct_absolute"; 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 yes = "$hardcode_minus_L"; then
|
|
add_dir=-L$libdir
|
|
add=-l$name
|
|
@@ -6953,6 +6957,7 @@ func_mode_link ()
|
|
# Calculate the version variables.
|
|
major=
|
|
versuffix=
|
|
+ versuffix2=
|
|
verstring=
|
|
case $version_type in
|
|
none) ;;
|
|
@@ -7023,6 +7028,7 @@ func_mode_link ()
|
|
func_arith $current - $age
|
|
major=.$func_arith_result
|
|
versuffix=$major.$age.$revision
|
|
+ versuffix2=$major.$age
|
|
;;
|
|
|
|
osf)
|
|
@@ -7088,8 +7094,10 @@ func_mode_link ()
|
|
esac
|
|
if test no = "$need_version"; then
|
|
versuffix=
|
|
+ versuffix2=
|
|
else
|
|
versuffix=.0.0
|
|
+ versuffix2=.0.0
|
|
fi
|
|
fi
|
|
|
|
@@ -7097,6 +7105,7 @@ func_mode_link ()
|
|
if test yes,no = "$avoid_version,$need_version"; then
|
|
major=
|
|
versuffix=
|
|
+ versuffix2=
|
|
verstring=
|
|
fi
|
|
|
|
@@ -7210,7 +7219,7 @@ func_mode_link ()
|
|
*-*-netbsd*)
|
|
# Don't link with libc until the a.out ld.so is fixed.
|
|
;;
|
|
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
|
|
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-mirbsd*)
|
|
# Do not include libc due to us having libc/libc_r.
|
|
;;
|
|
*-*-sco3.2v5* | *-*-sco5v6*)
|
|
@@ -7233,12 +7242,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
|
|
@@ -7515,6 +7526,7 @@ EOF
|
|
;;
|
|
esac
|
|
versuffix=$versuffix_save
|
|
+ versuffix2=$versuffix2_save
|
|
major=$major_save
|
|
release=$release_save
|
|
libname=$libname_save
|
|
@@ -9000,7 +9012,7 @@ dlpreopen='$dlprefiles'
|
|
|
|
# Directory that this library needs to be installed in:
|
|
libdir='$install_libdir'"
|
|
- if test no,yes = "$installed,$need_relink"; then
|
|
+ if test no,yes = "$installed,$need_relink" && test -n "$relink_command"; then
|
|
$ECHO >> $output "\
|
|
relink_command=\"$relink_command\""
|
|
fi
|