diff options
author | Baruch Siach <baruch@tkos.co.il> | 2018-06-10 22:09:22 +0300 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2018-06-11 22:01:43 +0200 |
commit | 1b86479da599072d00683e15307962b013b998fe (patch) | |
tree | 2d9ed2dcb7a26bcb9515ab8284cd5bfa21348491 /package/znc/0001-Fix-build-without-SSL-support.patch | |
parent | ba2ee2306b4d9c737630aae2898284c486f163ce (diff) | |
download | buildroot-1b86479da599072d00683e15307962b013b998fe.tar.gz buildroot-1b86479da599072d00683e15307962b013b998fe.zip |
znc: fix build without openssl
Add a patch to include <memory> unconditionally.
Fixes:
http://autobuild.buildroot.net/results/4c3/4c3d9f6f5214052b7eda4c7bbfabe5b463080b12/
http://autobuild.buildroot.net/results/d06/d06176f00109ad0707032b0d76fe94f1d414106c/
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/znc/0001-Fix-build-without-SSL-support.patch')
-rw-r--r-- | package/znc/0001-Fix-build-without-SSL-support.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/package/znc/0001-Fix-build-without-SSL-support.patch b/package/znc/0001-Fix-build-without-SSL-support.patch new file mode 100644 index 0000000000..23b78ed4be --- /dev/null +++ b/package/znc/0001-Fix-build-without-SSL-support.patch @@ -0,0 +1,37 @@ +From a263157165c411552d73a211ac9c7647285abdc5 Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Sun, 10 Jun 2018 22:01:47 +0300 +Subject: [PATCH] Fix build without SSL support + +The <memory> headers is needed for unique_ptr even when SSL is not +enabled. This fixes the following build failure: + +src/Utils.cpp: In static member function 'static bool CUtils::CheckCIDR(const CString&, const CString&)': +src/Utils.cpp:674:5: error: 'unique_ptr' is not a member of 'std' + std::unique_ptr<addrinfo, decltype(deleter)> aiHost(aiHostC, deleter); + ^ + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Upstream status: https://github.com/znc/znc/pull/1554 + + src/Utils.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Utils.cpp b/src/Utils.cpp +index 9c3b2549b791..cced5683d78a 100644 +--- a/src/Utils.cpp ++++ b/src/Utils.cpp +@@ -27,8 +27,8 @@ + #include <znc/Message.h> + #ifdef HAVE_LIBSSL + #include <openssl/ssl.h> +-#include <memory> + #endif /* HAVE_LIBSSL */ ++#include <memory> + #include <unistd.h> + #include <time.h> + +-- +2.17.1 + |