From 9d3617966c3f0de7d4112c0dc00f42cd9850315e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Sat, 26 Sep 2020 17:12:16 +0200
Subject: groups/251.native_packages_lib.group: libxslt: use pkgconfig for
 gcrypt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
---
 groups/251.native_packages_lib.group   |  3 ++-
 patches/libxslt-1.1.34_pre.local.patch | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 patches/libxslt-1.1.34_pre.local.patch

diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index 0b8d4f30..e583f49c 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -208,10 +208,11 @@ libxslt libz libzip wolfssl")";
 : ${PKG_LIBXML2_VERSION:=2.9.10};
 : ${PKG_LIBXML2_URL:=ftp://xmlsoft.org/libxml2/libxml2-${PKG_LIBXML2_VERSION}.tar.gz};
 : ${PKG_LIBXML2_CONFIGURE_ARGS_EXTRA:="--with-python=no"};
-: ${PKG_LIBXSLT_DEPENDS:="libxml2"};
+: ${PKG_LIBXSLT_DEPENDS:="libxml2 libgcrypt"};
 : ${PKG_LIBXSLT_SHA256SUM:=98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f};
 : ${PKG_LIBXSLT_VERSION:=1.1.34};
 : ${PKG_LIBXSLT_URL:=ftp://xmlsoft.org/libxslt/libxslt-${PKG_LIBXSLT_VERSION}.tar.gz};
+: ${PKG_LIBXSLT_FORCE_AUTORECONF:=1};
 : ${PKG_LIBZ_SHA256SUM:=abcc2831b7a0e891d0875fa852e9b9510b420d843d3d20aad010f65493fe4f7b};
 : ${PKG_LIBZ_VERSION:=1.2.8.2015.12.26};
 : ${PKG_LIBZ_URL:=https://sortix.org/libz/release/libz-${PKG_LIBZ_VERSION}.tar.gz};
diff --git a/patches/libxslt-1.1.34_pre.local.patch b/patches/libxslt-1.1.34_pre.local.patch
new file mode 100644
index 00000000..08be2163
--- /dev/null
+++ b/patches/libxslt-1.1.34_pre.local.patch
@@ -0,0 +1,25 @@
+diff -ru libxslt-1.1.34.orig/configure.ac libxslt-1.1.34/configure.ac
+--- libxslt-1.1.34.orig/configure.ac	2019-10-28 09:11:11.000000000 +0100
++++ libxslt-1.1.34/configure.ac	2020-09-26 17:08:16.822422567 +0200
+@@ -329,17 +329,16 @@
+     CRYPTO_TESTDIR=crypto
+     ;;
+   *)
+-    AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+-    if test "$LIBGCRYPT_CONFIG" != "no" ; then
+-      LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version`
++    if test "$PKG_CONFIG" != "no" ; then
++      LIBGCRYPT_VERSION=`$PKG_CONFIG --modver libgcrypt`
+       if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42")
+       then
+         LIBGCRYPT_CFLAGS=""
+         LIBGCRYPT_LIBS=""
+         echo 'gcrypt library version < 1.1.42 - Crypto extensions will not be available.'
+       else
+-        LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --cflags`
+-        LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --libs`
++        LIBGCRYPT_CFLAGS=`$PKG_CONFIG --cflags libgcrypt`
++        LIBGCRYPT_LIBS=`$PKG_CONFIG --libs libgcrypt`
+         AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.])
+         echo 'Crypto extensions will be available.'
+         WITH_CRYPTO=1
-- 
cgit v1.2.3