[arch-commits] Commit in lib32-json-c/trunk (PKGBUILD)

[Jan Steffens]

    Date: Friday, November 12, 2021 @ 22:01:07
  Author: heftig
Revision: 1044856

0.15-2

Modified:
  lib32-json-c/trunk/PKGBUILD

----------+
 PKGBUILD |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-12 22:00:02 UTC (rev 1044855)
+++ PKGBUILD	2021-11-12 22:01:07 UTC (rev 1044856)
@@ -2,13 +2,13 @@
 
 pkgname=lib32-json-c
 pkgver=0.15
-pkgrel=1
+pkgrel=2
 pkgdesc="A JSON implementation in C (32-bit)"
 url="https://github.com/json-c/json-c/wiki"
 license=(MIT)
 arch=(x86_64)
 depends=(lib32-glibc json-c)
-makedepends=(git cmake)
+makedepends=(git cmake ninja)
 provides=(libjson-c.so)
 _commit=9021cdcdd01fc9dbcbe1f06391848c2ac915212f  # tags/json-c-0.15-20200726^0
 source=("git+https://github.com/json-c/json-c#commit=$_commit")
@@ -29,13 +29,12 @@
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="i686-pc-linux-gnu-pkg-config"
-  CFLAGS+=" $CPPFLAGS"
-  CXXFLAGS+=" $CPPFLAGS"
 
-  cmake -Hjson-c -Bbuild \
+  cmake -S json-c -B build -G Ninja \
     -DCMAKE_BUILD_TYPE=None \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
+    -DBUILD_STATIC_LIBS=OFF \
     -DENABLE_THREADING=ON \
     -DENABLE_RDRAND=OFF
   cmake --build build
@@ -46,7 +45,7 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" cmake --build build --target install
+  DESTDIR="$pkgdir" cmake --install build
   rm -r "$pkgdir/usr/include"
   install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 json-c/COPYING
 }