From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtprelay05.ispgateway.de ([80.67.31.99]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Su7Sa-0005Ls-SM for ptxdist@pengutronix.de; Wed, 25 Jul 2012 21:41:30 +0200 Received: from [88.217.102.172] (helo=localhost) by smtprelay05.ispgateway.de with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.68) (envelope-from ) id 1Su7Sa-0005n8-7g for ptxdist@pengutronix.de; Wed, 25 Jul 2012 21:41:28 +0200 From: Bernhard Walle Date: Wed, 25 Jul 2012 21:41:21 +0200 Message-Id: <1343245282-24448-2-git-send-email-bernhard@bwalle.de> In-Reply-To: <1343245282-24448-1-git-send-email-bernhard@bwalle.de> References: <1343245282-24448-1-git-send-email-bernhard@bwalle.de> Subject: [ptxdist] [PATCH 2/3] libpcre: Add option to enable libbz2 for pcregrep Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Signed-off-by: Bernhard Walle --- rules/libpcre.in | 4 ++++ rules/libpcre.make | 1 + 2 files changed, 5 insertions(+) diff --git a/rules/libpcre.in b/rules/libpcre.in index b6aab3c..491c65b 100644 --- a/rules/libpcre.in +++ b/rules/libpcre.in @@ -5,6 +5,7 @@ menuconfig LIBPCRE prompt "libpcre " select GCCLIBS_CXX if LIBPCRE_LIBPCRECPP select ZLIB if LIBPCRE_ENABLE_PCREGREP_LIBZ + select BZIP2_LIBBZ2 if LIBPCRE_ENABLE_PCREGREP_LIBBZ2 help Perl 5 Compatible Regular Expression Library @@ -20,6 +21,9 @@ config LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF config LIBPCRE_ENABLE_PCREGREP_LIBZ bool "Enable grep libz" +config LIBPCRE_ENABLE_PCREGREP_LIBBZ2 + bool "Enable grep libbz2" + config LIBPCRE_ENABLE_UTF8 bool "Enable UTF8" diff --git a/rules/libpcre.make b/rules/libpcre.make index 754654a..8148b0f 100644 --- a/rules/libpcre.make +++ b/rules/libpcre.make @@ -38,6 +38,7 @@ LIBPCRE_ENV := $(CROSS_ENV) LIBPCRE_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_PCREGREP_LIBZ)-pcregrep-libz \ + --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_PCREGREP_LIBBZ2)-pcregrep-libbz2 \ --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_UTF8)-utf8 ifdef PTXCONF_LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de