diff options
Diffstat (limited to 'abs')
| -rw-r--r-- | abs/core/libtool/PKGBUILD | 39 | ||||
| -rw-r--r-- | abs/core/libtool/no_hostname.patch | 12 |
2 files changed, 38 insertions, 13 deletions
diff --git a/abs/core/libtool/PKGBUILD b/abs/core/libtool/PKGBUILD index 31abf0d..49edcaa 100644 --- a/abs/core/libtool/PKGBUILD +++ b/abs/core/libtool/PKGBUILD @@ -1,4 +1,3 @@ -# $Id$ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,23 +5,29 @@ # NOTE: requires rebuilt with each new gcc version pkgname=libtool -pkgver=2.4.6+40+g6ca5e224 -pkgrel=4 -_gccver=7.3.0 +pkgver=2.4.6+42+gb88cebd5 +pkgrel=14 +_gccver=10.2.0 pkgdesc='A generic library support script' arch=(x86_64) -url='http://www.gnu.org/software/libtool' +url='https://www.gnu.org/software/libtool' license=(GPL) groups=(base-devel) depends=(sh tar glibc) -makedepends=("gcc=$_gccver" git help2man) +makedepends=("gcc>=$_gccver" git help2man) +checkdepends=(gcc-fortran) provides=("libltdl=$pkgver" "libtool-multilib=$pkgver") -conflicts=('libltdl' 'libtool-multilib') -replaces=('libltdl' 'libtool-multilib') -_commit=6ca5e224bc7bcc114a9ba2cf5dcf0fbf0ec40c9f -source=(git+https://git.savannah.gnu.org/git/libtool.git#commit=$_commit) -md5sums=('SKIP') - +conflicts=(libltdl libtool-multilib) +replaces=(libltdl libtool-multilib) +_commit=b88cebd510add4420dd8f5367e3cc6e6e1f267cd +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) +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + '693aabb24a6e7ce21fe0b5d14394e19edcb8476663b5afa4463f9fa0df24d946') pkgver() { cd libtool @@ -31,6 +36,14 @@ pkgver() { prepare() { cd libtool + + patch -Np1 -i ${srcdir}/no_hostname.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 + ./bootstrap } @@ -42,7 +55,7 @@ build() { check() { cd libtool - make check || : + make check gl_public_submodule_commit= } package() { diff --git a/abs/core/libtool/no_hostname.patch b/abs/core/libtool/no_hostname.patch new file mode 100644 index 0000000..4fa900c --- /dev/null +++ b/abs/core/libtool/no_hostname.patch @@ -0,0 +1,12 @@ +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. |