[arch-commits] Commit in lib32-json-c/repos/multilib-x86_64 (PKGBUILD PKGBUILD)

[Christian Hesse]

    Date: Tuesday, May 5, 2020 @ 11:02:47
  Author: eworm
Revision: 624896

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-json-c/repos/multilib-x86_64/PKGBUILD
    (from rev 624895, lib32-json-c/trunk/PKGBUILD)
Deleted:
  lib32-json-c/repos/multilib-x86_64/PKGBUILD

----------+
 PKGBUILD |  107 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 55 insertions(+), 52 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-05 11:02:43 UTC (rev 624895)
+++ PKGBUILD	2020-05-05 11:02:47 UTC (rev 624896)
@@ -1,52 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=lib32-json-c
-pkgver=0.14
-pkgrel=1
-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)
-provides=(libjson-c.so)
-_commit=bae2f10c436eaf0d95746cbc5f1c1f0ecb866a8e  # tags/json-c-0.14-20200419^0
-source=("git+https://github.com/json-c/json-c#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd json-c
-  local tag="$(git describe --tags --abbrev=0)"
-  local ver="$(git describe --tags)"
-  echo "${tag%-*}${ver#$tag}" | sed 's/^json-c-//;s/-/+/g'
-}
-
-prepare() {
-  cd json-c
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="i686-pc-linux-gnu-pkg-config"
-
-  cmake -Hjson-c -Bbuild \
-    -DCMAKE_BUILD_TYPE=None \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
-    -DENABLE_THREADING=ON \
-    -DENABLE_RDRAND=ON
-  cmake --build build
-}
-
-check() {
-  cmake --build build --target test
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --build build --target install
-  rm -r "$pkgdir/usr/include"
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 json-c/COPYING
-}
-
-# vim:set sw=2 et:

Copied: lib32-json-c/repos/multilib-x86_64/PKGBUILD (from rev 624895, lib32-json-c/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-05 11:02:47 UTC (rev 624896)
@@ -0,0 +1,55 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=lib32-json-c
+pkgver=0.14
+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)
+provides=(libjson-c.so)
+_commit=bae2f10c436eaf0d95746cbc5f1c1f0ecb866a8e  # tags/json-c-0.14-20200419^0
+source=("git+https://github.com/json-c/json-c#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd json-c
+  local tag="$(git describe --tags --abbrev=0)"
+  local ver="$(git describe --tags)"
+  echo "${tag%-*}${ver#$tag}" | sed 's/^json-c-//;s/-/+/g'
+}
+
+prepare() {
+  cd json-c
+
+  # Detect broken RDRAND during initialization
+  git cherry-pick -n 4d36b0287d3ab0912ba8a4790340ca099960b2b0
+}
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="i686-pc-linux-gnu-pkg-config"
+
+  cmake -Hjson-c -Bbuild \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
+    -DENABLE_THREADING=ON \
+    -DENABLE_RDRAND=ON
+  cmake --build build
+}
+
+check() {
+  cmake --build build --target test
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --build build --target install
+  rm -r "$pkgdir/usr/include"
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 json-c/COPYING
+}
+
+# vim:set sw=2 et: