From ea595018ba8ae00d7030ff296ec4f50e122d2ea9 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 15 Aug 2011 23:14:29 +0000 Subject: Mon Aug 15 23:14:29 UTC 2011 --- multilib/libtool-multilib/PKGBUILD | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'multilib') diff --git a/multilib/libtool-multilib/PKGBUILD b/multilib/libtool-multilib/PKGBUILD index 87fcc28b0..3f777ffa4 100644 --- a/multilib/libtool-multilib/PKGBUILD +++ b/multilib/libtool-multilib/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 35242 2010-12-17 21:48:01Z heftig $ +# $Id: PKGBUILD 54231 2011-08-14 23:28:02Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Allan McRae # Contributor: judd -# NOTE: requires rebuilt with each new gcc version +# NOTE: requires rebuild with each new gcc version pkgbase=libtool-multilib pkgname=(libtool-multilib lib32-libtool) pkgver=2.4 -pkgrel=2 +pkgrel=4 pkgdesc="A generic library support script for multilib" arch=('x86_64') url="http://www.gnu.org/software/libtool" license=('GPL') -makedepends=(sh tar texinfo gcc-multilib) +_gccver=4.6.1 +makedepends=(sh tar "gcc-multilib=$_gccver") options=('!libtool') source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz) md5sums=('4e6144439d95d7332dc50ace6dd24c55') @@ -25,27 +26,30 @@ build() { mv libtool-$pkgver libtool-64 cp -a libtool-64 libtool-32 -msg2 "Building libtool-64..." - + msg2 "Building libtool-64..." cd "$srcdir/libtool-64" ./configure --prefix=/usr make - make check - -msg2 "Building libtool-32..." + msg2 "Building libtool-32..." export CC="gcc -m32" export CXX="g++ -m32" cd "$srcdir/libtool-32" ./configure --prefix=/usr --libdir=/usr/lib32 make - make check +} + +check() { + cd "$srcdir/libtool-64" + #make check + cd "$srcdir/libtool-32" + #make check } package_libtool-multilib() { groups=('multilib-devel') - depends=(sh tar texinfo "lib32-libtool=$pkgver-$pkgrel") + depends=(sh tar "gcc-multilib=$_gccver" "lib32-libtool=$pkgver-$pkgrel") provides=("libtool=$pkgver-$pkgrel") conflicts=(libtool) install=libtool.install -- cgit v1.2.3-54-g00ecf