[arch-commits] Commit in libtool-multilib/trunk (PKGBUILD)

[Jan Steffens]

    Date: Wednesday, December 10, 2014 @ 19:40:57
  Author: heftig
Revision: 123729

Changes to libtool make libtool-multilib obsolete

Modified:
  libtool-multilib/trunk/PKGBUILD

----------+
 PKGBUILD |   53 ++++++++++++++++-------------------------------------
 1 file changed, 16 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2014-12-10 18:16:17 UTC (rev 123728)
+++ PKGBUILD    2014-12-10 18:40:57 UTC (rev 123729)
@@ -3,60 +3,39 @@
 # Contributor: Allan McRae <al...@archlinux.org>
 # Contributor: judd <jvi...@zeroflux.org>
 
-# NOTE: requires rebuild with each new gcc version
+# NOTE: requires rebuilt with each new gcc version
 
-pkgname=libtool-multilib
+pkgname=lib32-libltdl
 pkgver=2.4.4
-_gccver=4.9.2
-pkgrel=2
-pkgdesc="A generic library support script for multilib"
+pkgrel=2.1
+pkgdesc="A generic library support script (32-bit)"
 arch=('x86_64')
 url="http://www.gnu.org/software/libtool";
 license=('GPL')
 groups=('multilib-devel')
-depends=('sh' 'tar' "gcc-multilib=${_gccver}")
-makedepends=("gcc-multilib=${_gccver}")
-provides=("lib32-libltdl" "lib32-libtool" "libltdl=$pkgver" 
"libtool=$pkgver-$pkgrel")
-conflicts=(lib32-libltdl lib32-libtool libltdl libtool)
-replaces=('lib32-libltdl' 'lib32-libtool')
-install=libtool.install
+depends=('sh' 'tar' 'lib32-glibc' 'libtool')
+makedepends=('gcc-multilib')
+provides=("lib32-libtool=$pkgver")
+conflicts=('lib32-libtool')
+replaces=('lib32-libtool')
 source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig})
 md5sums=('51bf400de3354687d68dfa2392506b7e'
          'SKIP')
 validpgpkeys=('CFE2BE707B538E8B26757D84151308092983D606')
 
-prepare() {
-  mv libtool-$pkgver libtool-64
-  cp -a libtool-64 libtool-32
-}
-
 build() {
-  ( msg2 "Building libtool-64..."
-    cd libtool-64
-    ./configure --prefix=/usr
-    make
-  )
-
-  ( msg2 "Building libtool-32..."
-    export CC="gcc -m32"
-    export CXX="g++ -m32"
-
-    cd libtool-32
-    ./configure --prefix=/usr --libdir=/usr/lib32
-    make
-  )
+  cd ${srcdir}/libtool-${pkgver}
+  export CC="gcc -m32" CXX="g++ -m32"
+  ./configure --prefix=/usr lt_cv_sys_lib_dlsearch_path_spec="/lib /usr/lib 
/usr/lib32" --libdir=/usr/lib32
+  make
 }
 
 check() {
-  cd libtool-64
-  make -k check
-  cd ../libtool-32
-  make -k check
+  cd ${srcdir}/libtool-${pkgver}
+  make check
 }
 
 package() {
-  cd libtool-64
-  make DESTDIR=${pkgdir} install
-  cd ../libtool-32
+  cd ${srcdir}/libtool-${pkgver}
   make DESTDIR=${pkgdir} install-libLTLIBRARIES
 }