gnutls: removed autogen patch

It was causing regressions in systems without some particular
development tools (see #8129)

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>

diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index e77139c843f8bbe4f6b17212b313b9eec3494f7e..36837c11122f4f0a363815a5472e3e4e67c8db62 100644 (file)
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnutls
 PKG_VERSION:=3.6.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_USE_MIPS16:=0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz

diff --git a/libs/gnutls/patches/001-no-autogen.patch b/libs/gnutls/patches/001-no-autogen.patch
deleted file mode 100644 (file)
index 741c281..0000000
--- a/libs/gnutls/patches/001-no-autogen.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
-diff --git a/configure.ac b/configure.ac
-index 2112606601..e0c5c25d5b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -735,7 +735,7 @@ if test "$enable_tools" != "no" || test "$enable_doc" != "no"; then
- *** autogen not found. Will not link against system libopts.
- *** ]])
-               dnl simulate specifying option on the command line
--              enable_local_libopts=yes
-+              included_libopts=yes
-       fi
-       LIBOPTS_CHECK([src/libopts])
-       if test "$NEED_LIBOPTS_DIR" = "true";then
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 0374924c53..8dac61cac5 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -272,6 +272,25 @@ libcmd_systemkey_la_LIBADD += $(LTLIBREADLINE) $(INET_PTON_LIB) $(LIB_CLOCK_GETT
- 
- SUFFIXES = .stamp .def .c.bak .h.bak
- 
-+if NEED_LIBOPTS
-+# case --enable-local-libopts: We only call AUTOGEN if the .bak files are not present.
-+# Normally we wouldn't want to call AUTOGEN here as it is explicitly asked not to, but
-+# in certain CI systems, we need to use this
-+# our CI systems, which work on
-+.def.stamp:
-+      b=`echo $@ | sed 's/.stamp$$//'`; \
-+      if ! test -f $${srcdir}$${b}.c.bak;then \
-+              echo $${srcdir}$${b}.c.bak; \
-+              $(AUTOGEN) $<; \
-+      else \
-+              srcdir=$(srcdir)/; \
-+              rm -f $${b}.c $${b}.h; \
-+              cp -p $${srcdir}$${b}.c.bak $${b}.c; \
-+              cp -p $${srcdir}$${b}.h.bak $${b}.h; \
-+      fi
-+      touch $@
-+else
-+# default case. We call autogen, and if that fails we resort to the bundled files.
- .def.stamp:
-       $(AM_V_GEN) $(AUTOGEN) $< || { \
-               srcdir=''; \
-@@ -281,6 +300,7 @@ SUFFIXES = .stamp .def .c.bak .h.bak
-               cp -p $${srcdir}$${b}.h.bak $${b}.h; \
-       } && \
-       touch $@
-+endif
- 
- .c.c.bak:
-       -@rm -f $@