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

[Jan Steffens]

    Date: Wednesday, December 10, 2014 @ 19:54:48
  Author: heftig
Revision: 123735

Bring back to state of [multilib]

Added:
  libtool-multilib/trunk/libtool.install
    (from rev 121775, libtool-multilib/trunk/libtool.install)
Modified:
  libtool-multilib/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   76 +++++++++++++++++++++++++++++++++++++++---------------
 libtool.install |   22 +++++++++++++++
 2 files changed, 77 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-10 18:48:18 UTC (rev 123734)
+++ PKGBUILD	2014-12-10 18:54:48 UTC (rev 123735)
@@ -3,39 +3,73 @@
 # Contributor: Allan McRae <allan at archlinux.org>
 # Contributor: judd <jvinet at zeroflux.org>
 
-# NOTE: requires rebuilt with each new gcc version
+# NOTE: requires rebuild with each new gcc version
 
-pkgname=lib32-libltdl
-pkgver=2.4.4
-pkgrel=2.1
-pkgdesc="A generic library support script (32-bit)"
+pkgbase=libtool-multilib
+pkgname=(libtool-multilib lib32-libltdl)
+pkgver=2.4.2
+_gccver=4.9.2
+pkgrel=15
+pkgdesc="A generic library support script for multilib"
 arch=('x86_64')
 url="http://www.gnu.org/software/libtool"
 license=('GPL')
-groups=('multilib-devel')
-depends=('sh' 'tar' 'lib32-glibc' 'libtool')
-makedepends=('gcc-multilib')
-provides=("lib32-libtool=$pkgver")
-conflicts=('lib32-libtool')
-replaces=('lib32-libtool')
+makedepends=("gcc-multilib=${_gccver}")
 source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig})
-md5sums=('51bf400de3354687d68dfa2392506b7e'
-         'SKIP')
+md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
+         '1e6ba57420c82c663c85e745d11c7eed')
 validpgpkeys=('CFE2BE707B538E8B26757D84151308092983D606')
 
+prepare() {
+  mv libtool-$pkgver libtool-64
+  cp -a libtool-64 libtool-32
+}
+
 build() {
-  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
+  ( 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
+  )
 }
 
 check() {
-  cd ${srcdir}/libtool-${pkgver}
-  make check
+  cd libtool-64
+  make -k check
+  cd ../libtool-32
+  make -k check
 }
 
-package() {
-  cd ${srcdir}/libtool-${pkgver}
+package_libtool-multilib() {
+  depends=('sh' "libltdl=$pkgver" 'tar' "gcc-multilib=${_gccver}" "lib32-libltdl=$pkgver")
+  groups=('multilib-devel')
+  install=libtool.install
+  provides=("libtool=$pkgver-$pkgrel")
+  conflicts=(libtool)
+
+  cd libtool-64
+  
+  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
+                         install-data-local
+  rm -r ${pkgdir}/usr/share/libtool/libltdl/
+}
+
+package_lib32-libltdl() {
+  pkgdesc="A system independent dlopen wrapper for GNU libtool (32-bit)"
+  depends=(lib32-glibc libltdl)
+  replaces=(lib32-libtool)
+  provides=("lib32-libtool=$pkgver-$pkgrel")
+  conflicts=(lib32-libtool)
+
+  cd libtool-32
   make DESTDIR=${pkgdir} install-libLTLIBRARIES
 }

Copied: libtool-multilib/trunk/libtool.install (from rev 121775, libtool-multilib/trunk/libtool.install)
===================================================================
--- libtool.install	                        (rev 0)
+++ libtool.install	2014-12-10 18:54:48 UTC (rev 123735)
@@ -0,0 +1,22 @@
+infodir=usr/share/info
+filelist=(libtool.info  libtool.info-1  libtool.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+# vim:set ts=2 sw=2 et: