live-bootstrap/sysa/libtool-1.4/patches/archive-objs-order.patch

66 lines
2.4 KiB
Diff

SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
SPDX-FileCopyrightText: 2010 Chris Demetriou <cgd@google.com>
SPDX-License-Identifier: GPL-2.0-or-later
Backported from upstream commit 74c8993c178a1386ea5e2363a01d919738402f30
--- ltmain.in 2001-04-25 02:10:46.000000000 +0300
+++ ltmain.in 2022-05-14 14:49:02.079789885 +0300
@@ -2839,7 +2839,7 @@
$show "(cd $xdir && $AR x $xabs)"
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+ libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | sort | $NL2SP`
done
fi
fi
@@ -2978,7 +2978,7 @@
$show "(cd $xdir && $AR x $xabs)"
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+ reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | sort | $NL2SP`
done
fi
fi
@@ -3762,7 +3762,7 @@
$show "(cd $xdir && $AR x $xabs)"
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+ oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | sort | $NL2SP`
done
fi
--- ltmain.sh 2001-04-25 02:35:10.000000000 +0300
+++ ltmain.sh 2022-05-14 14:46:49.170994957 +0300
@@ -2839,7 +2839,7 @@
$show "(cd $xdir && $AR x $xabs)"
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+ libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | sort | $NL2SP`
done
fi
fi
@@ -2978,7 +2978,7 @@
$show "(cd $xdir && $AR x $xabs)"
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+ reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | sort | $NL2SP`
done
fi
fi
@@ -3762,7 +3762,7 @@
$show "(cd $xdir && $AR x $xabs)"
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+ oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | sort | $NL2SP`
done
fi