Subject: [alpine-aports] [PATCH 1/2] main/json-c: support cross-compile

From: Daniel Sabogal <[email-masked]>
Date: Sat, 3 Feb 2018 10:03:55 -0500

---
 main/json-c/APKBUILD | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/main/json-c/APKBUILD b/main/json-c/APKBUILD
index 467ad6790f..08a3918dd8 100644
--- a/main/json-c/APKBUILD
+++ b/main/json-c/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=json-c
 pkgver=0.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A JSON implementation in C"
 url="https://github.com/json-c/json-c/wiki"
 arch="all"
@@ -25,12 +25,15 @@ prepare() {
 build() {
 	cd "$builddir"
 	./configure --prefix=/usr \
+		--build=$CBUILD \
+		--host=$CHOST \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--enable-shared \
-		 || return 1
+		ac_cv_func_malloc_0_nonnull=yes \
+		ac_cv_func_realloc_0_nonnull=yes
 	make -j1 || return 1
 }
 
-- 
2.16.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Daniel Sabogal <[email-masked]>
Date: Sat, 3 Feb 2018 10:03:56 -0500

---
 scripts/bootstrap.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 0b6addd984..c26c1dcb75 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -102,7 +102,8 @@ for PKG in fortify-headers linux-headers musl libc-dev pkgconf zlib \
 	   openrc alpine-conf alpine-baselayout alpine-keys alpine-base build-base \
 	   attr libcap patch sudo acl fakeroot tar \
 	   pax-utils abuild openssh \
-	   ncurses libcap-ng util-linux lvm2 popt xz cryptsetup kmod lddtree mkinitfs \
+	   ncurses libcap-ng util-linux lvm2 popt xz \
+	   json-c argon2 cryptsetup kmod lddtree mkinitfs \
 	   community/go libffi community/ghc \
 	   $KERNEL_PKG ; do
 
-- 
2.16.1

---