From 10b8610f7e27cdeb1e3c5648b2096f4146bf86f0 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 14 Dec 2014 15:46:10 +0000
Subject: [PATCH] core/libtool to 2.4.4-2

---
 core/libtool/PKGBUILD           | 51 ++++++++++++---------------------
 core/libtool/armv7h-nopic.patch | 11 -------
 2 files changed, 18 insertions(+), 44 deletions(-)
 delete mode 100644 core/libtool/armv7h-nopic.patch

diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD
index c777da3c7..717e1337f 100644
--- a/core/libtool/PKGBUILD
+++ b/core/libtool/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151926 2012-03-04 10:58:08Z allan $
+# $Id$
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
@@ -6,30 +6,32 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - noautobuild, !distcc
+#  - removed multilib stuff
 
 noautobuild=1
 
-pkgname=('libtool' 'libltdl')
-pkgver=2.4.2
-_gccver=4.9.2
-pkgrel=15
+pkgname=libtool
+pkgver=2.4.4
+pkgrel=2
 pkgdesc="A generic library support script"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libtool"
-makedepends=("gcc=${_gccver}")
 license=('GPL')
-options=('!distcc')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig}
-         armv7h-nopic.patch)
-md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
-         '1e6ba57420c82c663c85e745d11c7eed'
-         '7ba2180372dc52d4bfb31a9bafead630')
+groups=('base-devel')
+depends=('sh' 'tar' 'glibc')
+makedepends=('gcc')
+provides=("libltdl=$pkgver")
+conflicts=('libltdl')
+replaces=('libltdl')
+install=libtool.install
+source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('51bf400de3354687d68dfa2392506b7e'
+         'SKIP')
 validpgpkeys=('CFE2BE707B538E8B26757D84151308092983D606')
 
 build() {
-  [[ $CARCH == "armv7h" ]] && patch -p0 -i ${srcdir}/armv7h-nopic.patch
   cd ${srcdir}/${pkgbase}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr lt_cv_sys_lib_dlsearch_path_spec="/lib /usr/lib"
   make
 }
 
@@ -38,24 +40,7 @@ check() {
   make check
 }
 
-package_libtool() {
-  depends=('sh' "libltdl=$pkgver" 'tar' "gcc=${_gccver}")
-  groups=('base-devel')
-  install=libtool.install
-
+package() {
   cd ${srcdir}/${pkgbase}-${pkgver}
-  
-  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
-                         install-data-local
-  rm -r ${pkgdir}/usr/share/libtool/libltdl/
+  make DESTDIR=${pkgdir} install
 }
-
-package_libltdl() {
-  pkgdesc="A system independent dlopen wrapper for GNU libtool"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
-                         install-ltdlincludeHEADERS install-data-local
-  rm -r ${pkgdir}/usr/share/{aclocal,libtool/config}
-}
-
diff --git a/core/libtool/armv7h-nopic.patch b/core/libtool/armv7h-nopic.patch
deleted file mode 100644
index 713aa24b0..000000000
--- a/core/libtool/armv7h-nopic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtool-2.4.2/tests/demo-nopic.test.orig	2013-10-10 10:55:49.686651787 -0500
-+++ libtool-2.4.2/tests/demo-nopic.test	2013-10-10 05:45:45.027421384 -0500
-@@ -26,7 +26,7 @@
- . tests/defs || exit 1
- 
- case "$host" in
--hppa*|x86_64*|s390*)
-+hppa*|x86_64*|s390*|arm*)
- 	func_skip "$host doesn't like non-PIC shared libs"
- 	;;
- *-solaris*|*-sunos*)