From 7eceaa9603980ab7ec2bdc7e24f2af07899b9039 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Sep 15 2017 08:03:44 +0000 Subject: vars/build.vars: pass ${PKG_CONFIG} when building whois v5.2.18. patches/whois-5.2.18.local.patch: use ${PKG_CONFIG} instead of pkg-config. --- diff --git a/patches/whois-5.2.18.local.patch b/patches/whois-5.2.18.local.patch new file mode 100644 index 0000000..7a6b899 --- /dev/null +++ b/patches/whois-5.2.18.local.patch @@ -0,0 +1,21 @@ +--- whois-5.2.18/Makefile.orig 2017-08-22 18:48:50.000000000 +0200 ++++ whois-5.2.18/Makefile 2017-09-15 10:02:37.915199229 +0200 +@@ -32,12 +32,12 @@ + DEFS += -DLOCALEDIR=\"$(BASEDIR)$(prefix)/share/locale\" + endif + +-ifeq ($(shell pkg-config --exists 'libidn2 >= 2.0.3' || echo NO),) +-whois_LDADD += $(shell pkg-config --libs libidn2) +-DEFS += -DHAVE_LIBIDN2 $(shell pkg-config --cflags libidn2) +-else ifeq ($(shell pkg-config --exists 'libidn' || echo NO),) +-whois_LDADD += $(shell pkg-config --libs libidn) +-DEFS += -DHAVE_LIBIDN $(shell pkg-config --cflags libidn) ++ifeq ($(shell ${PKG_CONFIG} --exists 'libidn2 >= 2.0.3' || echo NO),) ++whois_LDADD += $(shell ${PKG_CONFIG} --libs libidn2) ++DEFS += -DHAVE_LIBIDN2 $(shell ${PKG_CONFIG} --cflags libidn2) ++else ifeq ($(shell ${PKG_CONFIG} --exists 'libidn' || echo NO),) ++whois_LDADD += $(shell ${PKG_CONFIG} --libs libidn) ++DEFS += -DHAVE_LIBIDN $(shell ${PKG_CONFIG} --cflags libidn) + endif + + ifdef HAVE_ICONV diff --git a/vars/build.vars b/vars/build.vars index 0082400..297ebfe 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -953,6 +953,7 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_WHOIS_VERSION:=5.2.18}; : ${PKG_WHOIS_URL:=https://github.com/rfc1036/whois/archive/v${PKG_WHOIS_VERSION}.tar.gz}; : ${PKG_WHOIS_BUILD_DIR:=whois-${PKG_WHOIS_VERSION}}; +: ${PKG_WHOIS_ENV_VARS_EXTRA:=PKG_CONFIG=${TARGET}-pkg-config}; : ${PKG_WHOIS_MAKEFLAGS_INSTALL:=BASEDIR=${PREFIX_NATIVE}}; : ${PKG_WHOIS_SUBDIR:=${PKG_WHOIS_BUILD_DIR}}; : ${PKG_XEYES_SHA256SUM:=975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521};