commit 743e6fc75da4f06d4999d83d1ca9c90927f1fbfd Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Aug 31 00:44:47 2019 +1000 glslang: add build jobs, clean dependencies and clean up cmake options diff --git a/glslang/.signature b/glslang/.signature index 786e0775e..93495e7c2 100644 --- a/glslang/.signature +++ b/glslang/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YuV3BdLYNX0t6/D9KsUD4fYvKe3YuPHQd1qnSCyFeDUUzZLIpe7vfJyfJefn9b+Yz6DK7TuKbEyP4YH2kAPSAM= -SHA256 (Pkgfile) = dad44f1814ec929b22159294bdc0d312d38679c20b9e1eecc9258004b4f685aa +RWSE3ohX2g5d/Sg5KlrHswWUMt55cON/wslr+lpO5bRyuGwQmyYprr2EoAMTmNAUDmFpHDvks3UrLKZxsOM6FIFoY/yz3gpu1Aw= +SHA256 (Pkgfile) = b76e4aeec44d6710f56a654385ed581ddfc1cefd144c27b3199fda8850b76163 SHA256 (.footprint) = b90552690b53fdf57ea6da5448d7e9e18ddabc8bba8ff7fd3fcef7b58c1bed1c SHA256 (glslang-7.12.3352.tar.gz) = 4ecce011b73dd7196a5114f66776d5a4c4c3674fc9bc6f39ad3c1ee15a8abbe1 SHA256 (0001-pkg-config-compatibility.patch) = efd22887303f1c6cdaacd31d6049438502bc7d699859fd501d075b8ab6f3ae42 diff --git a/glslang/Pkgfile b/glslang/Pkgfile index c3398102f..55b5f2de1 100644 --- a/glslang/Pkgfile +++ b/glslang/Pkgfile @@ -17,24 +17,20 @@ build() { mkdir -p build-{shared,static} + local config=" +-DCMAKE_INSTALL_PREFIX=/usr \ +-DCMAKE_INSTALL_LIBDIR=lib \ +-DCMAKE_BUILD_TYPE=Release \ +-GNinja" + (cd build-shared - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ - -GNinja \ - -DBUILD_SHARED_LIBS=ON - ninja + cmake .. $config -DBUILD_SHARED_LIBS=ON + ninja -j ${JOBS:-1} ) (cd build-static - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_BUILD_TYPE=Release \ - -GNinja \ - -DBUILD_SHARED_LIBS=OFF - ninja + cmake .. $config -DBUILD_SHARED_LIBS=OFF + ninja -j ${JOBS:-1} ) DESTDIR=$PKG ninja -C build-shared install