core/libtool to 2.4.7+83+g7b091831-1

This commit is contained in:
Kevin Mihelich 2024-05-08 18:28:50 +00:00
parent cb6ff3e1bd
commit 5befee3a31
4 changed files with 26 additions and 67 deletions

View file

@ -1,34 +1,30 @@
pkgbase = libtool
pkgdesc = A generic library support script
pkgver = 2.4.7+4+g1ec8fa28
pkgrel = 7
pkgver = 2.4.7+83+g7b091831
pkgrel = 1
url = https://www.gnu.org/software/libtool
arch = x86_64
license = GPL
checkdepends = gcc-fortran
makedepends = gcc>=13.2.1
makedepends = gcc>=14.1.1
makedepends = git
makedepends = help2man
depends = sh
depends = tar
depends = glibc
provides = libltdl=2.4.7+4+g1ec8fa28
provides = libtool-multilib=2.4.7+4+g1ec8fa28
provides = libltdl=2.4.7+83+g7b091831
provides = libtool-multilib=2.4.7+83+g7b091831
conflicts = libltdl
conflicts = libtool-multilib
replaces = libltdl
replaces = libtool-multilib
source = git+https://git.savannah.gnu.org/git/libtool.git#commit=1ec8fa28dcb29500d485c136db28315671ec4c3b
source = git+https://git.savannah.gnu.org/git/libtool.git#commit=7b0918310776395e1cbafe6a08b8df8f8a8a3e21
source = git+https://git.savannah.gnu.org/git/gnulib.git
source = gnulib-bootstrap::git+https://github.com/gnulib-modules/bootstrap.git
source = no_hostname.patch
source = disable-lto-link-order2.patch
source = grep_3.8_fix.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = 693aabb24a6e7ce21fe0b5d14394e19edcb8476663b5afa4463f9fa0df24d946
sha256sums = b6dce6681f223b18a90614edbcdeb00f228abd1216e22c4bd07285321cd2ceb7
sha256sums = 0a31d3ed91d97a18e17942c85018899c0233493a54c885f4c133454de522ef50
b2sums = 4609c9a44262e2ae1133eb62609c2dba06629ae77cfad1746dd086f02f85cdde43bde96dcd1113aac03ddc103c43f4ba5cf44c6390f56e20544433f6b2a5abd8
b2sums = SKIP
b2sums = SKIP
b2sums = 9d1e0460b9ef56ba33ac498814b409d1b1d7c3e8ed41a3aed2a86d86341ed7051ca88a5adfa92bd87da968460514230058c3d490b58537d95722e68d7d1687ff
pkgname = libtool

View file

@ -14,10 +14,10 @@
noautobuild=1
pkgname=libtool
_commit=1ec8fa28dcb29500d485c136db28315671ec4c3b
pkgver=2.4.7+4+g1ec8fa28
pkgrel=7
_gccver=13.2.1
pkgver=2.4.7+83+g7b091831
_commit=7b0918310776395e1cbafe6a08b8df8f8a8a3e21
pkgrel=1
_gccver=14.1.1
pkgdesc='A generic library support script'
arch=(x86_64)
url='https://www.gnu.org/software/libtool'
@ -29,20 +29,18 @@ provides=("libltdl=$pkgver")
conflicts=(libltdl)
replaces=(libltdl)
options=(!distcc)
source=(git+https://git.savannah.gnu.org/git/libtool.git#commit=$_commit
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
grep_3.8_fix.patch
armv7h-nopic.patch)
sha256sums=('SKIP'
armv7h-nopic.patch
)
b2sums=('4609c9a44262e2ae1133eb62609c2dba06629ae77cfad1746dd086f02f85cdde43bde96dcd1113aac03ddc103c43f4ba5cf44c6390f56e20544433f6b2a5abd8'
'SKIP'
'SKIP'
'693aabb24a6e7ce21fe0b5d14394e19edcb8476663b5afa4463f9fa0df24d946'
'b6dce6681f223b18a90614edbcdeb00f228abd1216e22c4bd07285321cd2ceb7'
'0a31d3ed91d97a18e17942c85018899c0233493a54c885f4c133454de522ef50'
'0e19dec2dabc958ef5d1bcfd0879174766c5783032319fc17d5d6692b2b397c8')
'9d1e0460b9ef56ba33ac498814b409d1b1d7c3e8ed41a3aed2a86d86341ed7051ca88a5adfa92bd87da968460514230058c3d490b58537d95722e68d7d1687ff'
'4a65a2525c8709faf7fe39dfada893e3a21d021f83c25b0798fe0584386c25755877e8b7c220fee6f252e4f2a42b47e4ba3bec36297d01e654b040232b0a711b')
pkgver() {
cd libtool
@ -52,17 +50,11 @@ pkgver() {
prepare() {
cd libtool
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
# 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

View file

@ -1,17 +0,0 @@
--- 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

View file

@ -1,12 +0,0 @@
Index: libtool-2.4.6/m4/libtool.m4
===================================================================
--- libtool-2.4.6.orig/m4/libtool.m4
+++ libtool-2.4.6/m4/libtool.m4
@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.