From 5dca47ca5b867502cc1fa9d8500a1ea2de7bd189 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 9 Jul 2019 10:07:13 +0200
Subject: gnutls: use external libtasn1

---
 src/gnutls.mk   |  3 +--
 src/libtasn1.mk | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 src/libtasn1.mk

diff --git a/src/gnutls.mk b/src/gnutls.mk
index 69e2a8f..94ba160 100644
--- a/src/gnutls.mk
+++ b/src/gnutls.mk
@@ -9,7 +9,7 @@ $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://gnupg.org/ftp/gcrypt/gnutls/v3.6/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnutls/v3.5/$($(PKG)_FILE)
-$(PKG)_DEPS     := cc gettext gmp libgnurx libidn2 libunistring nettle zlib
+$(PKG)_DEPS     := cc gettext gmp libgnurx libidn2 libtasn1 libunistring nettle zlib
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- https://gnupg.org/ftp/gcrypt/gnutls/v3.6/ | \
@@ -27,7 +27,6 @@ define $(PKG)_BUILD
         --disable-doc \
         --disable-tests \
         --enable-local-libopts \
-        --with-included-libtasn1 \
         --with-libregex-libs="-lgnurx" \
         --without-p11-kit \
         --disable-silent-rules
diff --git a/src/libtasn1.mk b/src/libtasn1.mk
new file mode 100644
index 0000000..8f39fb3
--- /dev/null
+++ b/src/libtasn1.mk
@@ -0,0 +1,24 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG             := libtasn1
+$(PKG)_WEBSITE  := https://www.gnu.org/software/libtasn1/
+$(PKG)_DESCR    := GnuTLS
+$(PKG)_VERSION  := 4.13
+$(PKG)_CHECKSUM := 7e528e8c317ddd156230c4e31d082cd13e7ddeb7a54824be82632209550c8cca
+$(PKG)_SUBDIR   := libtasn1-$($(PKG)_VERSION)
+$(PKG)_FILE     := libtasn1-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://ftp.gnu.org/gnu/libtasn1/$($(PKG)_FILE)
+$(PKG)_DEPS     := cc
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- https://ftp.gnu.org/gnu/libtasn1/ | \
+    $(SED) -n 's,.*libtasn1-\([1-9]\+\.[0-9]\+\)\..*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        $(MXE_CONFIGURE_OPTS)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+endef
-- 
cgit v0.12