aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch
diff options
context:
space:
mode:
authorDaniel Engberg <daniel.engberg.lists@pyret.net>2017-03-27 14:51:44 +0200
committerJo-Philipp Wich <jo@mein.io>2017-05-12 11:57:00 +0200
commitd40e2efa94fc04eb60c43809dc69f307534dd735 (patch)
tree5f97ac2acbbedb5e98e8b1e702b195ac506835e3 /package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch
parent98491a9ae9065dca067181e1f5e8ca930beeaa32 (diff)
downloadupstream-d40e2efa94fc04eb60c43809dc69f307534dd735.tar.gz
upstream-d40e2efa94fc04eb60c43809dc69f307534dd735.tar.bz2
upstream-d40e2efa94fc04eb60c43809dc69f307534dd735.zip
OpenVPN: Update to 2.4.1
Update OpenVPN to 2.4.1 Remove 200-small_build_enable_occ.patch as it's included upstream. Refresh patches Add mirror and switch to HTTPS Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch')
-rw-r--r--package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch8
1 files changed, 5 insertions, 3 deletions
diff --git a/package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch b/package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch
index 67191076d5..45a0207565 100644
--- a/package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch
+++ b/package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch
@@ -1,12 +1,12 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -1014,37 +1014,14 @@ dnl
+@@ -1058,37 +1058,14 @@ dnl
AC_ARG_VAR([LZ4_CFLAGS], [C compiler flags for lz4])
AC_ARG_VAR([LZ4_LIBS], [linker flags for lz4])
if test "$enable_lz4" = "yes" && test "$enable_comp_stub" = "no"; then
- AC_CHECKING([for LZ4 Library and Header files])
- havelz4lib=1
-
+
- # if LZ4_LIBS is set, we assume it will work, otherwise test
- if test -z "${LZ4_LIBS}"; then
- AC_CHECK_LIB(lz4, LZ4_compress,
@@ -19,7 +19,7 @@
+ AC_MSG_RESULT([Using LZ4 library in src/compat/compat-lz4.*])
+ AC_DEFINE([NEED_COMPAT_LZ4], [1], [use copy of LZ4 source in compat/])
+ LZ4_LIBS=""
-
+
- saved_CFLAGS="${CFLAGS}"
- CFLAGS="${CFLAGS} ${LZ4_CFLAGS}"
- AC_CHECK_HEADERS(lz4.h,
@@ -39,3 +39,5 @@
AC_DEFINE(ENABLE_LZ4, 1, [Enable LZ4 compression library])
- CFLAGS="${saved_CFLAGS}"
fi
+
+