Commit in lib32-zstd/trunk (PKGBUILD)

[Levente Polyak]

    Date: Tuesday, February 21, 2023 @ 23:15:41
  Author: anthraxx
Revision: 1403344

upgpkg: lib32-zstd 1.5.4-1

Modified:
  lib32-zstd/trunk/PKGBUILD

----------+
 PKGBUILD |   52 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-02-21 22:33:00 UTC (rev 1403343)
+++ PKGBUILD    2023-02-21 23:15:41 UTC (rev 1403344)
@@ -5,48 +5,58 @@
 
 _pkgname=zstd
 pkgname=lib32-zstd
-pkgver=1.5.2
+pkgver=1.5.4
 pkgrel=1
 pkgdesc='Zstandard - Fast real-time compression algorithm (32-bit)'
 url='https://facebook.github.io/zstd/'
-arch=('x86_64')
-license=('BSD' 'GPL2')
-depends=('zstd' 'lib32-glibc')
-makedepends=('gtest')
-provides=('libzstd.so')
+arch=(x86_64)
+license=(BSD GPL2)
+depends=(zstd lib32-glibc)
+makedepends=(cmake gtest ninja)
+provides=(libzstd.so)
 
source=(https://github.com/facebook/zstd/releases/download/v${pkgver}/zstd-${pkgver}.tar.zst{,.sig})
-sha256sums=('3ea06164971edec7caa2045a1932d757c1815858e4c2b68c7ef812647535c23f'
+sha256sums=('6925880b84aca086308c27036ef1c16e76817372301ead7c37f90e23567f704e'
             'SKIP')
-sha512sums=('bf8183dcb42ac306c120836fdd03a13f3f41de72f697a928a7795008acc86e2533ce42f6b554bde7f1ca834f1a0282f8371585b9129ea88441f3f8dd49f1e923'
-            'SKIP')
-b2sums=('513e4526a92bcb59416b3457d186a30e554f9e0cf21d7114eb3e9fbcbd9d662c8d95cf0b06237f6fe3f756862c63de0aa146d6a23cb4111c16e6459608d115f1'
+b2sums=('8caea5dae06928076c2e54b059a501bd757663bae5948cb49ae32a7591c11636b22cb3b45d4f91653da800e1815cf5b28f72c69f4696ada4fdc746a272239da9'
         'SKIP')
 validpgpkeys=(4EF4AC63455FC9F4545D9B7DEF8FE99528B52FFD)
 
+prepare() {
+  cd ${_pkgname}-${pkgver}
+  # avoid error on tests without static libs, we use LD_LIBRARY_PATH
+  sed '/build static library to build tests/d' -i build/cmake/CMakeLists.txt
+  sed 's/libzstd_static/libzstd_shared/g' -i build/cmake/tests/CMakeLists.txt
+}
+
 build() {
   cd ${_pkgname}-${pkgver}
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  make
-  make zstdmt
-  make -C contrib/pzstd
+
+  export CFLAGS+=' -ffat-lto-objects'
+  export CXXFLAGS+=' -ffat-lto-objects'
+
+  cmake -S build/cmake -B build -G Ninja \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib32 \
+    -DZSTD_BUILD_CONTRIB=ON \
+    -DZSTD_BUILD_STATIC=OFF \
+    -DZSTD_BUILD_TESTS=ON \
+    -DZSTD_PROGRAMS_LINK_SHARED=ON
+  cmake --build build
 }
 
 check() {
   cd ${_pkgname}-${pkgver}
-  make check
-  make -C contrib/pzstd test
+  LD_LIBRARY_PATH="$(pwd)/build/lib" \
+    ctest -VV --test-dir build
 }
 
 package() {
   cd ${_pkgname}-${pkgver}
-  make \
-    PREFIX=/usr \
-    LIBDIR=/usr/lib32 \
-    PKGCONFIGDIR=/usr/lib32/pkgconfig \
-    DESTDIR="${pkgdir}" \
-    install
+  DESTDIR="${pkgdir}" cmake --install build
   rm -rf "${pkgdir}"/usr/{share,include,bin}
   install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }