Sun Mar 4 00:01:47 UTC 2012

3 files changed, 103 insertions, 7 deletions

diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD
index 08c23ef69..ea9bf7b80 100644
--- a/multilib-testing/gcc-multilib/PKGBUILD
+++ b/multilib-testing/gcc-multilib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66816 2012-02-28 23:00:55Z allan $
+# $Id: PKGBUILD 66975 2012-03-03 03:50:38Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 
@@ -7,9 +7,9 @@
 
 pkgbase='gcc-multilib'
 pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
-pkgver=4.6.2
-pkgrel=8
-_snapshot=4.6-20120120
+pkgver=4.6.3
+pkgrel=1
+#_snapshot=4.6-20120120
 _libstdcppmanver=20111215
 pkgdesc="The GNU Compiler Collection for multilib"
 arch=('x86_64')
@@ -19,13 +19,13 @@ makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib'
              'lib32-glibc>=2.14')
 checkdepends=('dejagnu')
 options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
 	gcc_pure64-multilib.patch
 	gcc-hash-style-both.patch
         gcc-4.6.2-cloog-0.17.patch)
-md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
+md5sums=('773092fe5194353b02bb0110052a972e'
          '450772ce32daed97d7383199f8797f33'
          '7da5b7ab75b3c29993f953b18bc38579'
          '4df25b623799b148a0703eaeec8fdf3f'
diff --git a/multilib-testing/libtool-multilib/PKGBUILD b/multilib-testing/libtool-multilib/PKGBUILD
new file mode 100644
index 000000000..f81121e6b
--- /dev/null
+++ b/multilib-testing/libtool-multilib/PKGBUILD
@@ -0,0 +1,74 @@
+# $Id: PKGBUILD 66976 2012-03-03 03:51:25Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+# NOTE: requires rebuild with each new gcc version
+
+pkgbase=libtool-multilib
+pkgname=(libtool-multilib lib32-libltdl)
+pkgver=2.4.2
+pkgrel=4
+pkgdesc="A generic library support script for multilib"
+arch=('x86_64')
+url="http://www.gnu.org/software/libtool"
+license=('GPL')
+_gccver=4.6.3
+makedepends=("gcc-multilib=$_gccver")
+options=('!libtool')
+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
+  mv libtool-$pkgver libtool-64
+  cp -a libtool-64 libtool-32
+
+  msg2 "Building libtool-64..."
+  cd "$srcdir/libtool-64"
+  ./configure --prefix=/usr
+  make
+
+  msg2 "Building libtool-32..."
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+
+  cd "$srcdir/libtool-32"
+  ./configure --prefix=/usr --libdir=/usr/lib32
+  make
+}
+
+check() {
+  cd "$srcdir/libtool-64"
+  make check
+  cd "$srcdir/libtool-32"
+  make check
+}
+
+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 "$srcdir/libtool-64"
+  
+  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
+                         install-data-local
+  rm -rf ${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 "$srcdir/libtool-32"
+  make DESTDIR="$pkgdir" install-libLTLIBRARIES
+}
diff --git a/multilib-testing/libtool-multilib/libtool.install b/multilib-testing/libtool-multilib/libtool.install
new file mode 100644
index 000000000..f4f700705
--- /dev/null
+++ b/multilib-testing/libtool-multilib/libtool.install
@@ -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: