From d225fd31ca408c422b8c145ab5ab88d69be86650 Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Tue, 9 Sep 2014 05:36:53 -0300 Subject: lib32-clang: fix include dir on lib32 dir --- libre-multilib/lib32-clang/PKGBUILD | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libre-multilib/lib32-clang/PKGBUILD b/libre-multilib/lib32-clang/PKGBUILD index dac49b5eb..01501bb08 100644 --- a/libre-multilib/lib32-clang/PKGBUILD +++ b/libre-multilib/lib32-clang/PKGBUILD @@ -4,10 +4,12 @@ pkgname=lib32-clang pkgver=3.5.0 -pkgrel=1 +pkgrel=2 +pkgdesc="C language family frontend for LLVM (32-bit)" arch=('x86_64') url="http://clang.llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') +depends=('clang' 'lib32-llvm' 'gcc-multilib') # please use libretools, install "multilib-devel" on chroot and add # "CHROOTEXTRAPKG=(multilib-devel)" on "/etc/libretools.d/chroot.conf" file. makedepends=('lib32-libffi' 'lib32-zlib' 'python2') @@ -48,15 +50,15 @@ prepare() { } build() { - cd "$srcdir/llvm-$pkgver.src" + cd $srcdir/llvm-$pkgver.src - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + export CC='gcc -m32' + export CXX='g++ -m32' + export PKG_CONFIG_PATH=/usr/lib32/pkgconfig # Apply strip option to configure - _optimized_switch="enable" - [[ $(check_option strip) == n ]] && _optimized_switch="disable" + _optimized_switch=enable + [[ $(check_option strip) == n ]] && _optimized_switch=disable # Include location of libffi headers in CPPFLAGS CPPFLAGS+=" $(pkg-config --cflags libffi)" @@ -83,19 +85,17 @@ build() { make REQUIRES_RTTI=1 } -package_lib32-clang() { - pkgdesc="C language family frontend for LLVM (32-bit)" - depends=('clang' 'lib32-llvm' 'gcc-multilib') - - cd "$srcdir/llvm-$pkgver.src/tools/clang" +package() { + cd $srcdir/llvm-$pkgver.src/tools/clang - make -C lib DESTDIR="$pkgdir" install + make -C lib DESTDIR=$pkgdir install - # remove include dir - rm -vrf "$pkgdir"/usr/lib + # fix include dir on lib32 dir + rm -rv $pkgdir/usr/lib + ln -s /usr/lib/clang $pkgdir/usr/lib32/clang # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib32/*.a + chmod -x $pkgdir/usr/lib32/*.a install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -- cgit v1.2.3