[arch-commits] Commit in openshadinglanguage/trunk (2 files)

[Evangelos Foutras]

    Date: Monday, March 16, 2015 @ 02:31:20
  Author: foutrelis
Revision: 129342

upgpkg: openshadinglanguage 1.5.12-4

Build statically against LLVM 3.5 to fix a crash that occurs when both
libLLVM-3.5.so and libLLVM-3.6.so get loaded. (LLVM 3.6 gets loaded by
mesa.)

Added:
  openshadinglanguage/trunk/llvm-static-system-libs.patch
Modified:
  openshadinglanguage/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   13 ++++++++++---
 llvm-static-system-libs.patch |   15 +++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-16 00:16:04 UTC (rev 129341)
+++ PKGBUILD	2015-03-16 01:31:20 UTC (rev 129342)
@@ -2,21 +2,28 @@
 # Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
 pkgname=openshadinglanguage
 pkgver=1.5.12
-pkgrel=3
+pkgrel=4
 pkgdesc="Advanced shading language for production GI renderers"
 arch=(i686 x86_64)
 url="https://github.com/imageworks/OpenShadingLanguage"
 license=('custom')
-depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' 'libtiff' 'llvm35-libs')
+depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng'
+         'libtiff' 'zlib' 'ncurses')
 makedepends=('boost' 'cmake' 'clang35' 'llvm35')
 source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
+        llvm-static-system-libs.patch
         alignment.patch::https://github.com/imageworks/OpenShadingLanguage/commit/bcaf5778e2d778b72615e5c49269b59671cf0d91.patch)
 md5sums=('484752a0f97df55962c3a667075deddc'
+         'b7c212b2549981ced03c091375f48122'
          'f3f24c2aa7f5aabd98c0967747b58ecc')
 
 prepare() {
   cd OpenShadingLanguage-Release-$pkgver
   patch -Np1 < $srcdir/alignment.patch
+
+  # Add system libraries needed to link against LLVM components (zlib, ncurses)
+  # This is required in order to statically link against LLVM
+  patch -Np1 < $srcdir/llvm-static-system-libs.patch
 }
 
 build() {
@@ -29,7 +36,7 @@
 
   cmake ../.. \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLLVM_STATIC=0 \
+    -DLLVM_STATIC=1 \
     -DCMAKE_CXX_FLAGS="-std=c++11"
   make
 }

Added: llvm-static-system-libs.patch
===================================================================
--- llvm-static-system-libs.patch	                        (rev 0)
+++ llvm-static-system-libs.patch	2015-03-16 01:31:20 UTC (rev 129342)
@@ -0,0 +1,15 @@
+diff -upr OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake
+--- OpenShadingLanguage-Release-1.5.12.orig/src/cmake/externalpackages.cmake	2014-12-26 22:22:53.000000000 +0200
++++ OpenShadingLanguage-Release-1.5.12/src/cmake/externalpackages.cmake	2015-03-16 03:12:56.052479730 +0200
+@@ -211,9 +211,10 @@ if ((LLVM_LIBRARY OR LLVM_STATIC) AND LL
+     # if static LLVM libraries were requested, use llvm-config to generate
+     # the list of what libraries we need, and substitute that in the right
+     # way for LLVM_LIBRARY.
+-    execute_process (COMMAND ${LLVM_CONFIG} --libfiles
++    execute_process (COMMAND ${LLVM_CONFIG} --libfiles --system-libs
+                      OUTPUT_VARIABLE LLVM_LIBRARY
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)
++    string (REPLACE "\n" " " LLVM_LIBRARY ${LLVM_LIBRARY})
+     string (REPLACE " " ";" LLVM_LIBRARY ${LLVM_LIBRARY})
+   endif ()
+   if (VERBOSE)