From f3bf7eb1252e7fed75112e6d47c5de0bd4f6c954 Mon Sep 17 00:00:00 2001 From: Marcin Jurkowski Date: Wed, 25 Oct 2017 16:52:28 +0200 Subject: [PATCH] nbd: fix gnutls dependency Get rid of gnutls dependency introduced in 5bca84b. Needs patching configure script to make gnutls existence test optional. Signed-off-by: Marcin Jurkowski --- net/nbd/Makefile | 3 ++- .../patches/100-make-gnutls-test-optional.patch | 15 +++++++++++++++ ...s.patch => 101-fix-build-without-gnutls.patch} | 0 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 net/nbd/patches/100-make-gnutls-test-optional.patch rename net/nbd/patches/{100-fix-build-without-gnutls.patch => 101-fix-build-without-gnutls.patch} (100%) diff --git a/net/nbd/Makefile b/net/nbd/Makefile index 6177f399a..8107891b5 100644 --- a/net/nbd/Makefile +++ b/net/nbd/Makefile @@ -51,7 +51,8 @@ define Package/nbd-server/description endef CONFIGURE_ARGS += \ - --disable-glibtest + --disable-glibtest \ + --without-gnutls TARGET_CFLAGS += --std=gnu99 -DNODAEMON diff --git a/net/nbd/patches/100-make-gnutls-test-optional.patch b/net/nbd/patches/100-make-gnutls-test-optional.patch new file mode 100644 index 000000000..29586eac3 --- /dev/null +++ b/net/nbd/patches/100-make-gnutls-test-optional.patch @@ -0,0 +1,15 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -210,7 +210,11 @@ dnl ;; + dnl esac + dnl fi + +-PKG_CHECK_MODULES(GnuTLS, [gnutls >= 2.12.0],[HAVE_GNUTLS=1],[HAVE_GNUTLS=0]) ++AC_ARG_WITH([gnutls], AS_HELP_STRING([--with-gnutls], [Build with GnuTLS])) ++AS_IF([test "x$with_gnutls" = "xyes"], [ ++ PKG_CHECK_MODULES(GnuTLS, [gnutls >= 2.12.0],[HAVE_GNUTLS=1],[HAVE_GNUTLS=0]) ++]) ++ + if test x$HAVE_GNUTLS = x1; then + AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if you have a GnuTLS version of 2.12 or above]) + else diff --git a/net/nbd/patches/100-fix-build-without-gnutls.patch b/net/nbd/patches/101-fix-build-without-gnutls.patch similarity index 100% rename from net/nbd/patches/100-fix-build-without-gnutls.patch rename to net/nbd/patches/101-fix-build-without-gnutls.patch