Re: [ptxdist] [PATCH 2/3] libpcre: Add option to enable libbz2 for pcregrep

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Wed, Jul 25, 2012 at 09:41:21PM +0200, Bernhard Walle wrote:
> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> ---
>  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

You need to select BZIP2 as well, otherwise the make dependency is
missing.

Michael

>  	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
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de