From patchwork Fri Mar 24 07:12:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeroen Roovers X-Patchwork-Id: 743092 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vqF3q6SKHz9s82 for ; Fri, 24 Mar 2017 18:12:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D77DB88559; Fri, 24 Mar 2017 07:12:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oQmN8m_rXzff; Fri, 24 Mar 2017 07:12:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 30026884C2; Fri, 24 Mar 2017 07:12:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 14E5A1C00A0 for ; Fri, 24 Mar 2017 07:12:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0882788F29 for ; Fri, 24 Mar 2017 07:12:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1+6IWo+cJGEl for ; Fri, 24 Mar 2017 07:12:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from lb3-smtp-cloud6.xs4all.net (lb3-smtp-cloud6.xs4all.net [194.109.24.31]) by hemlock.osuosl.org (Postfix) with ESMTPS id 183B488F01 for ; Fri, 24 Mar 2017 07:12:18 +0000 (UTC) Received: from rej.fritz.box ([IPv6:2001:984:fcd5:1:73e3:d21b:46d4:ac40]) by smtp-cloud6.xs4all.net with ESMTP id zjCB1u00624JTJj01jCHW6; Fri, 24 Mar 2017 08:12:17 +0100 From: Jeroen Roovers To: buildroot@buildroot.org Date: Fri, 24 Mar 2017 08:12:03 +0100 Message-Id: <20170324071203.32449-1-jer@airfi.aero> X-Mailer: git-send-email 2.12.1 Cc: Jeroen Roovers Subject: [Buildroot] [PATCH] openvpn: Add explicit support for external lz4 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 2.4.0 added lz4 support. Make that choice explicit or the bundled compat-lz4 "stub" will be used. Signed-off-by: Jeroen Roovers --- package/openvpn/Config.in | 7 +++++++ package/openvpn/openvpn.mk | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in index 5fa191d97..0a1675573 100644 --- a/package/openvpn/Config.in +++ b/package/openvpn/Config.in @@ -14,6 +14,13 @@ config BR2_PACKAGE_OPENVPN if BR2_PACKAGE_OPENVPN +config BR2_PACKAGE_OPENVPN_LZ4 + bool "LZ4 compression" + default y + select BR2_PACKAGE_LZ4 + help + Enable LZ4 compression. + config BR2_PACKAGE_OPENVPN_LZO bool "LZO compression" default y diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 5e3df59f3..e152eb39a 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -36,6 +36,12 @@ else OPENVPN_CONF_ENV += IPROUTE=/sbin/ip endif +ifeq ($(BR2_PACKAGE_OPENVPN_LZ4),y) +OPENVPN_DEPENDENCIES += lz4 +else +OPENVPN_CONF_OPTS += --disable-lz4 +endif + ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y) OPENVPN_DEPENDENCIES += lzo else