diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-10-15 14:41:24 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-10-15 14:41:24 +0200 |
| commit | 16b092881b0225752d6f6fcea041831395537b6e (patch) | |
| tree | 922549a873d3d9897a0f01812e4618c03116f16d /core | |
| parent | bbfdba4140a91cfdb10af0fc0592a5889bcbf260 (diff) | |
Update libtool, use a Debian patch to skip failing test.
Diffstat (limited to 'core')
| -rw-r--r-- | core/libtool/PKGBUILD | 12 | ||||
| -rw-r--r-- | core/libtool/nopic.patch | 13 |
2 files changed, 20 insertions, 5 deletions
diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index f0ff53324..76b0b92b1 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137791 2011-09-11 02:39:11Z allan $ +# $Id: PKGBUILD 138461 2011-09-24 03:53:12Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -7,17 +7,19 @@ pkgname=('libtool' 'libltdl') pkgver=2.4 pkgrel=5 -pkgrel=3 # holdver pkgdesc="A generic library support script" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libtool" license=('GPL') options=('!libtool') -source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz) -md5sums=('4e6144439d95d7332dc50ace6dd24c55') +source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz + nopic.patch) +md5sums=('4e6144439d95d7332dc50ace6dd24c55' + '46443cf0e3e1b4e4891812af73385615') build() { cd ${srcdir}/${pkgbase}-${pkgver} + patch -Np1 -i "${srcdir}/nopic.patch" ./configure --prefix=/usr make } @@ -28,7 +30,7 @@ check() { } package_libtool() { - depends=('sh' "libltdl=$pkgver" 'gcc=4.6.1') + depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.1') groups=('base-devel') install=libtool.install diff --git a/core/libtool/nopic.patch b/core/libtool/nopic.patch new file mode 100644 index 000000000..43a712685 --- /dev/null +++ b/core/libtool/nopic.patch @@ -0,0 +1,13 @@ +Index: libtool-2.2.6a/tests/demo-nopic.test +=================================================================== +--- libtool-2.2.6a.orig/tests/demo-nopic.test 2008-11-18 21:11:29.000000000 +0000 ++++ libtool-2.2.6a/tests/demo-nopic.test 2008-11-18 21:12:41.000000000 +0000 +@@ -26,7 +26,7 @@ + . tests/defs || exit 1 + + case "$host" in +-hppa*|x86_64*|s390*) ++hppa*|x86_64*|s390*|mips*|arm*) + func_skip "$host doesn't like non-PIC shared libs" + ;; + *-solaris*|*-sunos*) |