lib32-llvm: 3.9.0

lib32-llvm/PKGBUILD

@@ -3,12 +3,12 @@
 
 pkgname=('lib32-llvm' 'lib32-llvm-libs' 'lib32-clang')
 pkgver=3.9.0
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
 makedepends=('cmake' 'lib32-libffi' 'lib32-zlib' 'python2' 'gcc-libs'
-             'lib32-libxml2')
+             'lib32-libxml2' 'lib32-gcc-libs')
 options=('staticlibs')
 source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.xz{,.sig}
         http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.xz{,.sig}
@@ -18,9 +18,7 @@ sha256sums=('66c73179da42cee1386371641241f79ded250e117a79f571bbd69e56daa48948'
             '7596a7c7d9376d0c89e60028fe1ceb4d3e535e8ea8b89e0eb094e0dcb3183d28'
             'SKIP'
             'e0e5224fcd5740b61e416c549dd3dcda92f10c524216c1edb5e979e42078a59a'
-            'SKIP'
-            'cf9c8b4d70b4547eda162644658c5c203c3139fcea6c75003b6cd7dc11a8cccc'
-            'a1c9f36b97c639666ab6a1bd647a08a027e93e3d3cfd6f5af9c36e757599ce81')
+            'SKIP')
 validpgpkeys=('11E521D646982372EB577A1F8F0871F202119294'
               'B6C8F98282B944E3B0D5C2530FC3042E345AD05D')
 
@@ -32,6 +30,11 @@ prepare() {
   mv "$srcdir/cfe-$pkgver.src" tools/clang 
   mv "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt
 
+  # Somehow CMake finds the 64-bit library in /lib first,
+  # so let's preseed CMAKE_LIBRARY_PATH with /lib32.
+  sed -i '/^[[:blank:]]*find_library(FFI_LIBRARY_PATH/i\
+         list(INSERT CMAKE_LIBRARY_PATH 0 /usr/lib32)' cmake/config-ix.cmake
+
   mkdir build
 }
 
@@ -40,7 +43,6 @@ build() {
 
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
   cmake \
-    -DCMAKE_CROSSCOMPILING=True \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLLVM_LIBDIR_SUFFIX=32 \
@@ -48,11 +50,11 @@ build() {
     -DCMAKE_CXX_FLAGS=-m32 \
     -DLLVM_TARGET_ARCH=i686 \
     -DLLVM_DEFAULT_TARGET_TRIPLE="i686-unknown-linux-gnu" \
-    -DBUILD_SHARED_LIBS=ON \
+    -DLLVM_BUILD_LLVM_DYLIB=ON \
+    -DLLVM_LINK_LLVM_DYLIB=ON \
     -DLLVM_ENABLE_RTTI=ON \
     -DLLVM_ENABLE_FFI=ON \
     -DFFI_INCLUDE_DIR=$(pkg-config --variable=includedir libffi) \
-    -DFFI_LIBRARY_DIR=/usr/lib32/ \
     -DLLVM_BUILD_DOCS=OFF \
     -DLLVM_ENABLE_SPHINX=OFF \
     -DLLVM_ENABLE_DOXYGEN=OFF \
@@ -76,9 +78,8 @@ package_lib32-llvm() {
   make -C build DESTDIR="$pkgdir" install
 
   # The runtime library goes into lib32-llvm-libs
-  mv "$pkgdir"/usr/lib32/lib{LLVM,LTO}.so* "$srcdir"
+  mv "$pkgdir"/usr/lib32/lib{LLVM,LTO}*.so* "$srcdir"
   mv -f "$pkgdir"/usr/lib32/{LLVMgold,BugpointPasses}.so "$srcdir"
-  mv -f "$pkgdir"/usr/lib/libLLVM-3.9*.so "$srcdir"
 
   # Fix permissions of static libs
   chmod -x "$pkgdir"/usr/lib32/*.a
@@ -110,9 +111,8 @@ package_lib32-llvm-libs() {
   install -d "$pkgdir/usr/lib32"
 
   cp -P \
-    "$srcdir"/lib{LLVM,LTO}.so* \
+    "$srcdir"/lib{LLVM,LTO}*.so* \
     "$srcdir"/{LLVMgold,BugpointPasses}.so \
-    "$srcdir"/libLLVM-3.9*.so \
     "$pkgdir/usr/lib32/"
 
   # Symlink LLVMgold.so from /usr/lib/bfd-plugins