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

Jan Steffens heftig at nymeria.archlinux.org
Mon Oct 21 02:39:46 UTC 2013


    Date: Monday, October 21, 2013 @ 04:39:46
  Author: heftig
Revision: 98883

!staticlibs

Modified:
  libtool-multilib/trunk/PKGBUILD

----------+
 PKGBUILD |   54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-21 00:55:51 UTC (rev 98882)
+++ PKGBUILD	2013-10-21 02:39:46 UTC (rev 98883)
@@ -8,58 +8,58 @@
 pkgbase=libtool-multilib
 pkgname=(libtool-multilib lib32-libltdl)
 pkgver=2.4.2
-pkgrel=11
+_gccver=4.8.2
+pkgrel=12
 pkgdesc="A generic library support script for multilib"
 arch=('x86_64')
 url="http://www.gnu.org/software/libtool"
 license=('GPL')
-_gccver=4.8.2
-makedepends=("gcc-multilib=$_gccver")
-options=('!libtool')
+makedepends=("gcc-multilib=${_gccver}")
 source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig})
 md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
          '1e6ba57420c82c663c85e745d11c7eed')
 
-build() {
-  cd "$srcdir"
-
-  rm -rf libtool-64 libtool-32
+prepare() {
   mv libtool-$pkgver libtool-64
   cp -a libtool-64 libtool-32
+}
 
-  msg2 "Building libtool-64..."
-  cd "$srcdir/libtool-64"
-  ./configure --prefix=/usr
-  make
+build() {
+  ( msg2 "Building libtool-64..."
+    cd libtool-64
+    ./configure --prefix=/usr
+    make
+  )
 
-  msg2 "Building libtool-32..."
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
+  ( msg2 "Building libtool-32..."
+    export CC="gcc -m32"
+    export CXX="g++ -m32"
 
-  cd "$srcdir/libtool-32"
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
+    cd libtool-32
+    ./configure --prefix=/usr --libdir=/usr/lib32
+    make
+  )
 }
 
 check() {
-  cd "$srcdir/libtool-64"
-  make check
-  cd "$srcdir/libtool-32"
-  make check
+  cd libtool-64
+  make -k check
+  cd ../libtool-32
+  make -k check
 }
 
 package_libtool-multilib() {
-  depends=('sh' "libltdl=$pkgver" 'tar' "gcc-multilib=$_gccver" "lib32-libltdl=$pkgver")
+  depends=('sh' "libltdl=$pkgver" 'tar' "gcc-multilib=${_gccver}" "lib32-libltdl=$pkgver")
   groups=('multilib-devel')
   install=libtool.install
   provides=("libtool=$pkgver-$pkgrel")
   conflicts=(libtool)
 
-  cd "$srcdir/libtool-64"
+  cd libtool-64
   
   make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
                          install-data-local
-  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
+  rm -r ${pkgdir}/usr/share/libtool/libltdl/
 }
 
 package_lib32-libltdl() {
@@ -69,6 +69,6 @@
   provides=("lib32-libtool=$pkgver-$pkgrel")
   conflicts=(lib32-libtool)
 
-  cd "$srcdir/libtool-32"
-  make DESTDIR="$pkgdir" install-libLTLIBRARIES
+  cd libtool-32
+  make DESTDIR=${pkgdir} install-libLTLIBRARIES
 }




More information about the arch-commits mailing list