snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

xbps.sh: override all libtool scripts after configure. 

--HG--
extra : convert_revision : 555b2d477c4e0691a8d1994ad7ee264c161e372f
This commit is contained in:
Juan RP 2008-10-15 00:21:35 +02:00
parent dcaa308afe
commit 4833911e22
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xbps.sh
View File

@ -552,21 +552,21 @@ fetch_distfiles()
fixup_tmpl_libtool() fixup_tmpl_libtool()
{ {
local lt_file="$wrksrc/libtool"
# #
# If package has a libtool file replace it with ours, so that # If package has a libtool file replace it with ours, so that
# we use the master directory while relinking, all will be fine # we use the master directory while relinking, all will be fine
# once the package is stowned. # once the package is stowned.
# #
if [ -f "$lt_file" -a -f "$XBPS_MASTERDIR/bin/libtool" ]; then for f in $($find_cmd $wrksrc -type f -name libtool\*); do
$rm_cmd -f $wrksrc/libtool if [ -f $f ]; then
$rm_cmd -f $wrksrc/ltmain.sh $rm_cmd -f $f
$ln_cmd -s $XBPS_MASTERDIR/bin/libtool $lt_file $ln_cmd -s $XBPS_MASTERDIR/bin/libtool $f
fi
done
if [ -f $wrksrc/ltmain.sh ]; then
$ln_cmd -s $XBPS_MASTERDIR/share/libtool/config/ltmain.sh \ $ln_cmd -s $XBPS_MASTERDIR/share/libtool/config/ltmain.sh \
$wrksrc/ltmain.sh $wrksrc/ltmain.sh
elif [ -f "$XBPS_MASTERDIR/bin/libtool" ]; then
$ln_cmd -s $XBPS_MASTERDIR/bin/libtool $lt_file
fi fi
} }
@ -676,9 +676,6 @@ configure_src_phase()
set_build_vars set_build_vars
# Fixup libtool script if necessary
fixup_tmpl_libtool
# #
# Packages using GNU autoconf # Packages using GNU autoconf
# #
@ -739,6 +736,9 @@ configure_src_phase()
unset eval ${f%=*} unset eval ${f%=*}
done done
# Override libtool scripts if necessary
fixup_tmpl_libtool
$touch_cmd -f $XBPS_CONFIGURE_DONE $touch_cmd -f $XBPS_CONFIGURE_DONE
} }