From a5721a07196cf00c26ea1bfb651aab756d202ccb Mon Sep 17 00:00:00 2001 From: root Date: Sat, 26 May 2012 00:02:35 +0000 Subject: Sat May 26 00:02:35 UTC 2012 --- multilib/lib32-llvm/PKGBUILD | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) (limited to 'multilib/lib32-llvm') diff --git a/multilib/lib32-llvm/PKGBUILD b/multilib/lib32-llvm/PKGBUILD index 56d168afd..c05932afe 100644 --- a/multilib/lib32-llvm/PKGBUILD +++ b/multilib/lib32-llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70524 2012-05-10 14:59:27Z lcarlier $ +# $Id: PKGBUILD 71120 2012-05-24 14:15:03Z lcarlier $ # Maintainer: Evangelos Foutras # Contributor: Jan "heftig" Steffens # Contributor: Sebastian Nowicki @@ -10,14 +10,14 @@ # Contributor: Gerardo Exequiel Pozzi pkgname=('lib32-llvm') -pkgver=3.0 -pkgrel=3 +pkgver=3.1 +pkgrel=1 arch=('x86_64') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') makedepends=('lib32-libffi' 'python2' 'gcc-multilib') -source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tar.gz) -sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477') +source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz) +sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab') build() { cd "$srcdir/llvm-$pkgver.src" @@ -26,11 +26,19 @@ build() { export CXX="g++ -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + rm -rf tools/clang + rm -rf projects/compiler-rt + # Fix installation directories, ./configure doesn't seem to set them right sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib32/llvm:' \ -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ Makefile.config.in + sed -i '/ActiveLibDir = ActivePrefix/s:lib:lib32/llvm:' \ + tools/llvm-config/llvm-config.cpp + sed -i 's:LLVM_LIBDIR="${prefix}/lib":LLVM_LIBDIR="${prefix}/lib32/llvm":' \ + autoconf/configure.ac \ + configure # Fix insecure rpath (http://bugs.archlinux.org/task/14017) sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules @@ -42,6 +50,14 @@ build() { # Include location of libffi headers in CPPFLAGS export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" + # Use Python 2 + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + export PATH="$srcdir/python2-path:$PATH" + + # We had to force host and target to get + # a proper triplet reported by llvm + ./configure \ --prefix=/usr \ --libdir=/usr/lib32/llvm \ @@ -53,15 +69,19 @@ build() { --disable-debug-runtime \ --disable-assertions \ --with-binutils-include=/usr/include \ - --with-cxx-include-arch=$CHOST \ + --host=i386-pc-linux-gnu \ + --target=i386-pc-linux-gnu \ --$_optimized_switch-optimized + +# --with-cxx-include-arch=$CHOST \ + make REQUIRES_RTTI=1 } package() { pkgdesc="Low Level Virtual Machine (32 bits version)" - depends=('perl' 'lib32-libffi' 'llvm') + depends=('lib32-libffi' 'llvm') cd "$srcdir/llvm-$pkgver.src" @@ -75,7 +95,7 @@ package() { chmod -x "$pkgdir"/usr/lib32/llvm/*.a # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) - sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/lib32/llvm:' "$pkgdir/usr/bin/llvm-config" + # sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/lib32/llvm:' "$pkgdir/usr/bin/llvm-config" mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm-config" # Get rid of example Hello transformation @@ -90,7 +110,12 @@ package() { install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + mv "$pkgdir"/usr/include/llvm/Config/*config.h "$pkgdir/" rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}} + install -d "$pkgdir/usr/include/llvm/Config" + mv "$pkgdir/config.h" "$pkgdir/usr/include/llvm/Config/config-32.h" + mv "$pkgdir/llvm-config.h" "$pkgdir/usr/include/llvm/Config/llvm-config-32.h" + mkdir "$pkgdir"/usr/bin mv "$pkgdir/usr/lib32/llvm-config" "$pkgdir/usr/bin/llvm-config32" } -- cgit v1.2.3-54-g00ecf