Date: Sunday, January 15, 2023 @ 21:28:23 Author: freswa Revision: 466648
binutils 2.40 rebuild Added: libtool/trunk/grep_3.8_fix.patch Modified: libtool/trunk/PKGBUILD --------------------+ PKGBUILD | 28 +++++++++++++++++----------- grep_3.8_fix.patch | 17 +++++++++++++++++ 2 files changed, 34 insertions(+), 11 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-01-15 20:47:56 UTC (rev 466647) +++ PKGBUILD 2023-01-15 21:28:23 UTC (rev 466648) @@ -7,9 +7,10 @@ # NOTE: requires rebuilt with each new gcc version pkgname=libtool -pkgver=2.4.7 -pkgrel=5 -_gccver=12.2.0 +_commit=1ec8fa28dcb29500d485c136db28315671ec4c3b +pkgver=2.4.7+4+g1ec8fa28 +pkgrel=1 +_gccver=12.2.1 pkgdesc='A generic library support script' arch=(x86_64) url='https://www.gnu.org/software/libtool' @@ -21,17 +22,18 @@ provides=("libltdl=$pkgver" "libtool-multilib=$pkgver") conflicts=(libltdl libtool-multilib) replaces=(libltdl libtool-multilib) -_commit=6d7ce133ce54898cf28abd89d167cccfbc3c9b2b source=(git+https://git.savannah.gnu.org/git/libtool.git#commit=$_commit git+https://git.savannah.gnu.org/git/gnulib.git gnulib-bootstrap::git+https://github.com/gnulib-modules/bootstrap.git no_hostname.patch - disable-lto-link-order2.patch) + disable-lto-link-order2.patch + grep_3.8_fix.patch) sha256sums=('SKIP' 'SKIP' 'SKIP' '693aabb24a6e7ce21fe0b5d14394e19edcb8476663b5afa4463f9fa0df24d946' - 'b6dce6681f223b18a90614edbcdeb00f228abd1216e22c4bd07285321cd2ceb7') + 'b6dce6681f223b18a90614edbcdeb00f228abd1216e22c4bd07285321cd2ceb7' + '0a31d3ed91d97a18e17942c85018899c0233493a54c885f4c133454de522ef50') pkgver() { cd libtool @@ -41,17 +43,21 @@ prepare() { cd libtool - patch -Np1 -i ${srcdir}/no_hostname.patch + patch -Np1 -i "${srcdir}"/no_hostname.patch # test 67 is broken with lto # this patch removes the -flto flag for this very test # adapt when -ffat-lto-objects is enabled by Arch - patch -Np1 -i ${srcdir}/disable-lto-link-order2.patch + patch -Np1 -i "${srcdir}"/disable-lto-link-order2.patch + # test 66 is broken with grep 3.8 + # see https://bugzilla.opensuse.org/show_bug.cgi?id=1203097 + patch -Np1 -i "${srcdir}"/grep_3.8_fix.patch + git submodule init - git config --local submodule.gnulib.url "$srcdir/gnulib" - git config --local submodule.gl-mod/bootstrap.url "$srcdir/gnulib-bootstrap" - git submodule update + git config --local submodule.gnulib.url "${srcdir}"/gnulib + git config --local submodule.gl-mod/bootstrap.url "${srcdir}"/gnulib-bootstrap + git -c protocol.file.allow=always submodule update ./bootstrap } Added: grep_3.8_fix.patch =================================================================== --- grep_3.8_fix.patch (rev 0) +++ grep_3.8_fix.patch 2023-01-15 21:28:23 UTC (rev 466648) @@ -0,0 +1,17 @@ +--- libtool-2.4.7/tests/link-order.at ++++ libtool-2.4.7/tests/link-order.at +@@ -99,12 +99,12 @@ aix* | interix*) ;; # These systems hav + case $hardcode_direct$hardcode_direct_absolute in + yesno) + AT_CHECK([if $EGREP relinking stderr; then +- $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout ++ $EGREP " .*/new/lib/libb$shared_ext .*/old/lib/libcee$shared_ext" stdout + else :; fi], [0], [ignore], [], [echo "wrong link order"]) + ;; + *) + AT_CHECK([if $EGREP relinking stderr; then +- $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout ++ $EGREP " -L.*/new/lib -lb -L.*/old/lib -lcee" stdout + else :; fi], [0], [ignore], [], [echo "wrong link order"]) + ;; + esac
