From fd9624b66b5ed731894c0b1094602668ab1c238a Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Sun, 19 May 2019 01:24:22 +1000 Subject: [PATCH] spirv-tools: builld dynamic libraries as well as the static ones --- spirv-tools/.footprint | 4 ++++ spirv-tools/.signature | 6 +++--- spirv-tools/Pkgfile | 33 +++++++++++++++++++++------------ 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/spirv-tools/.footprint b/spirv-tools/.footprint index 8fe8eec51..14b90471b 100644 --- a/spirv-tools/.footprint +++ b/spirv-tools/.footprint @@ -18,10 +18,14 @@ drwxr-xr-x root/root usr/include/spirv-tools/ -rw-r--r-- root/root usr/include/spirv-tools/optimizer.hpp drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libSPIRV-Tools-link.a +-rwxr-xr-x root/root usr/lib/libSPIRV-Tools-link.so -rw-r--r-- root/root usr/lib/libSPIRV-Tools-opt.a +-rwxr-xr-x root/root usr/lib/libSPIRV-Tools-opt.so -rw-r--r-- root/root usr/lib/libSPIRV-Tools-reduce.a +-rwxr-xr-x root/root usr/lib/libSPIRV-Tools-reduce.so -rwxr-xr-x root/root usr/lib/libSPIRV-Tools-shared.so -rw-r--r-- root/root usr/lib/libSPIRV-Tools.a +-rwxr-xr-x root/root usr/lib/libSPIRV-Tools.so drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/SPIRV-Tools-shared.pc -rw-r--r-- root/root usr/lib/pkgconfig/SPIRV-Tools.pc diff --git a/spirv-tools/.signature b/spirv-tools/.signature index fa87674c4..6dbf0240f 100644 --- a/spirv-tools/.signature +++ b/spirv-tools/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/e+Jknelcns7QNKVa4YXWG062jDItqdH0oOMcagitbcz8KoSczfeXNsdTih74IqXy8ZC5C+Im0lOFy/2N9Qe/wo= -SHA256 (Pkgfile) = ef3fd3b58da53ab3e0e9bc022f1ab4e02edb0bfdb4ce293733765facd9ca8d6f -SHA256 (.footprint) = 7eedf8b657a2884ff56545bbbd6b3fe09a193d07ed7c65683e6a9f0a8f78e0ce +RWSE3ohX2g5d/bCpzViK4tvp5okkrbwW35rqexebwMvaPcvmR33tor+vQnL+UZs+wx/m1hGiRm4xClAJZ48x1kQhInCbPEkXiwM= +SHA256 (Pkgfile) = 50597b286bf9caccd60498db951706d8fdbb903c4c6daae5b17cc132f543a4b6 +SHA256 (.footprint) = 26c4c01f8dae69d79601f9a86e85f1ead5957e8b5f81c49cddd92d3ce76cc4be SHA256 (SPIRV-Tools-v2019.2.tar.gz) = 1fde9d2a0df920a401441cd77253fc7b3b9ab0578eabda8caaaceaa6c7638440 diff --git a/spirv-tools/Pkgfile b/spirv-tools/Pkgfile index 19db5f22c..0ce4ec491 100644 --- a/spirv-tools/Pkgfile +++ b/spirv-tools/Pkgfile @@ -5,22 +5,31 @@ name=spirv-tools version=2019.2 -release=2 +release=3 source=(https://github.com/KhronosGroup/SPIRV-Tools/archive//v$version/SPIRV-Tools-v$version.tar.gz) build() { - cd SPIRV-Tools-$version + cd SPIRV-Tools-$version - mkdir build - cd build + mkdir build-{shared,static} - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ - -DSPIRV_WERROR=Off \ - -DSPIRV-Headers_SOURCE_DIR=/usr + local config=" +-DCMAKE_INSTALL_PREFIX=/usr \ +-DCMAKE_INSTALL_LIBDIR=lib \ +-DCMAKE_BUILD_TYPE=Release \ +-DSPIRV_WERROR=Off \ +-DSPIRV-Headers_SOURCE_DIR=/usr" - make - make DESTDIR=$PKG install + (cd build-static + cmake .. $config -DBUILD_SHARED_LIBS=OFF + make + ) + + (cd build-shared + cmake .. $config -DBUILD_SHARED_LIBS=ON + make + ) + + make -C build-static DESTDIR=$PKG install + make -C build-shared DESTDIR=$PKG install }