* [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 @ 2012-07-25 19:41 Bernhard Walle 2012-07-25 19:41 ` [ptxdist] [PATCH 2/3] libpcre: Add option to enable libbz2 for pcregrep Bernhard Walle 2012-07-25 19:41 ` [ptxdist] [PATCH 3/3] libpcre: Allow installation of pcregrep Bernhard Walle 0 siblings, 2 replies; 8+ messages in thread From: Bernhard Walle @ 2012-07-25 19:41 UTC (permalink / raw) To: ptxdist Signed-off-by: Bernhard Walle <bernhard@bwalle.de> --- rules/libpcre.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libpcre.make b/rules/libpcre.make index 7291b68..754654a 100644 --- a/rules/libpcre.make +++ b/rules/libpcre.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBPCRE) += libpcre # # Paths and names # -LIBPCRE_VERSION := 8.00 -LIBPCRE_MD5 := caf564aa69d68e965e9bf0ff2a094c65 +LIBPCRE_VERSION := 8.31 +LIBPCRE_MD5 := 1c9a276af932b5599157f96e945391f0 LIBPCRE := pcre-$(LIBPCRE_VERSION) LIBPCRE_SUFFIX := tar.bz2 LIBPCRE_URL := $(call ptx/mirror, SF, pcre/$(LIBPCRE).$(LIBPCRE_SUFFIX)) -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 2/3] libpcre: Add option to enable libbz2 for pcregrep 2012-07-25 19:41 [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 Bernhard Walle @ 2012-07-25 19:41 ` Bernhard Walle 2012-07-25 21:07 ` Michael Olbrich 2012-07-25 19:41 ` [ptxdist] [PATCH 3/3] libpcre: Allow installation of pcregrep Bernhard Walle 1 sibling, 1 reply; 8+ messages in thread From: Bernhard Walle @ 2012-07-25 19:41 UTC (permalink / raw) To: ptxdist 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 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 2/3] libpcre: Add option to enable libbz2 for pcregrep 2012-07-25 19:41 ` [ptxdist] [PATCH 2/3] libpcre: Add option to enable libbz2 for pcregrep Bernhard Walle @ 2012-07-25 21:07 ` Michael Olbrich 2012-07-26 19:47 ` [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 Bernhard Walle 0 siblings, 1 reply; 8+ messages in thread From: Michael Olbrich @ 2012-07-25 21:07 UTC (permalink / raw) To: ptxdist 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 2012-07-25 21:07 ` Michael Olbrich @ 2012-07-26 19:47 ` Bernhard Walle 2012-07-26 19:47 ` [ptxdist] [PATCH 2/3] libpcre: Add option to enable libbz2 for pcregrep Bernhard Walle ` (2 more replies) 0 siblings, 3 replies; 8+ messages in thread From: Bernhard Walle @ 2012-07-26 19:47 UTC (permalink / raw) To: ptxdist Signed-off-by: Bernhard Walle <bernhard@bwalle.de> --- rules/libpcre.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libpcre.make b/rules/libpcre.make index 7291b68..754654a 100644 --- a/rules/libpcre.make +++ b/rules/libpcre.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBPCRE) += libpcre # # Paths and names # -LIBPCRE_VERSION := 8.00 -LIBPCRE_MD5 := caf564aa69d68e965e9bf0ff2a094c65 +LIBPCRE_VERSION := 8.31 +LIBPCRE_MD5 := 1c9a276af932b5599157f96e945391f0 LIBPCRE := pcre-$(LIBPCRE_VERSION) LIBPCRE_SUFFIX := tar.bz2 LIBPCRE_URL := $(call ptx/mirror, SF, pcre/$(LIBPCRE).$(LIBPCRE_SUFFIX)) -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 2/3] libpcre: Add option to enable libbz2 for pcregrep 2012-07-26 19:47 ` [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 Bernhard Walle @ 2012-07-26 19:47 ` Bernhard Walle 2012-07-26 19:47 ` [ptxdist] [PATCH 3/3] libpcre: Allow installation of pcregrep Bernhard Walle 2012-07-27 13:29 ` [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 Michael Olbrich 2 siblings, 0 replies; 8+ messages in thread From: Bernhard Walle @ 2012-07-26 19:47 UTC (permalink / raw) To: ptxdist Signed-off-by: Bernhard Walle <bernhard@bwalle.de> --- rules/libpcre.in | 5 +++++ rules/libpcre.make | 1 + 2 files changed, 6 insertions(+) diff --git a/rules/libpcre.in b/rules/libpcre.in index b6aab3c..713d35d 100644 --- a/rules/libpcre.in +++ b/rules/libpcre.in @@ -5,6 +5,8 @@ menuconfig LIBPCRE prompt "libpcre " select GCCLIBS_CXX if LIBPCRE_LIBPCRECPP select ZLIB if LIBPCRE_ENABLE_PCREGREP_LIBZ + select BZIP2 if LIBPCRE_ENABLE_PCREGREP_LIBBZ2 + select BZIP2_LIBBZ2 if LIBPCRE_ENABLE_PCREGREP_LIBBZ2 help Perl 5 Compatible Regular Expression Library @@ -20,6 +22,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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 3/3] libpcre: Allow installation of pcregrep 2012-07-26 19:47 ` [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 Bernhard Walle 2012-07-26 19:47 ` [ptxdist] [PATCH 2/3] libpcre: Add option to enable libbz2 for pcregrep Bernhard Walle @ 2012-07-26 19:47 ` Bernhard Walle 2012-07-27 13:29 ` [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 Michael Olbrich 2 siblings, 0 replies; 8+ messages in thread From: Bernhard Walle @ 2012-07-26 19:47 UTC (permalink / raw) To: ptxdist Signed-off-by: Bernhard Walle <bernhard@bwalle.de> --- rules/libpcre.in | 3 +++ rules/libpcre.make | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/rules/libpcre.in b/rules/libpcre.in index 713d35d..79fa9df 100644 --- a/rules/libpcre.in +++ b/rules/libpcre.in @@ -34,4 +34,7 @@ config LIBPCRE_LIBPCREPOSIX config LIBPCRE_LIBPCRECPP bool "install libpcrecpp (c++ bindings for libpcre)" +config LIBPCRE_PCREGREP + bool "install pcregrep on the target" + endif diff --git a/rules/libpcre.make b/rules/libpcre.make index 8148b0f..faa1c78 100644 --- a/rules/libpcre.make +++ b/rules/libpcre.make @@ -66,6 +66,11 @@ endif ifdef PTXCONF_LIBPCRE_LIBPCRECPP @$(call install_lib, libpcre, 0, 0, 0644, libpcrecpp) endif + +ifdef PTXCONF_LIBPCRE_PCREGREP + @$(call install_copy, libpcre, 0, 0, 0755, -, /usr/bin/pcregrep) +endif + @$(call install_finish, libpcre) @$(call touch) -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 2012-07-26 19:47 ` [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 Bernhard Walle 2012-07-26 19:47 ` [ptxdist] [PATCH 2/3] libpcre: Add option to enable libbz2 for pcregrep Bernhard Walle 2012-07-26 19:47 ` [ptxdist] [PATCH 3/3] libpcre: Allow installation of pcregrep Bernhard Walle @ 2012-07-27 13:29 ` Michael Olbrich 2 siblings, 0 replies; 8+ messages in thread From: Michael Olbrich @ 2012-07-27 13:29 UTC (permalink / raw) To: ptxdist On Thu, Jul 26, 2012 at 09:47:29PM +0200, Bernhard Walle wrote: > Signed-off-by: Bernhard Walle <bernhard@bwalle.de> Thanks, all 3 patches applied. Michael > --- > rules/libpcre.make | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/rules/libpcre.make b/rules/libpcre.make > index 7291b68..754654a 100644 > --- a/rules/libpcre.make > +++ b/rules/libpcre.make > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBPCRE) += libpcre > # > # Paths and names > # > -LIBPCRE_VERSION := 8.00 > -LIBPCRE_MD5 := caf564aa69d68e965e9bf0ff2a094c65 > +LIBPCRE_VERSION := 8.31 > +LIBPCRE_MD5 := 1c9a276af932b5599157f96e945391f0 > LIBPCRE := pcre-$(LIBPCRE_VERSION) > LIBPCRE_SUFFIX := tar.bz2 > LIBPCRE_URL := $(call ptx/mirror, SF, pcre/$(LIBPCRE).$(LIBPCRE_SUFFIX)) > -- > 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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH 3/3] libpcre: Allow installation of pcregrep 2012-07-25 19:41 [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 Bernhard Walle 2012-07-25 19:41 ` [ptxdist] [PATCH 2/3] libpcre: Add option to enable libbz2 for pcregrep Bernhard Walle @ 2012-07-25 19:41 ` Bernhard Walle 1 sibling, 0 replies; 8+ messages in thread From: Bernhard Walle @ 2012-07-25 19:41 UTC (permalink / raw) To: ptxdist Signed-off-by: Bernhard Walle <bernhard@bwalle.de> --- rules/libpcre.in | 3 +++ rules/libpcre.make | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/rules/libpcre.in b/rules/libpcre.in index 491c65b..adb7519 100644 --- a/rules/libpcre.in +++ b/rules/libpcre.in @@ -33,4 +33,7 @@ config LIBPCRE_LIBPCREPOSIX config LIBPCRE_LIBPCRECPP bool "install libpcrecpp (c++ bindings for libpcre)" +config LIBPCRE_PCREGREP + bool "install pcregrep on the target" + endif diff --git a/rules/libpcre.make b/rules/libpcre.make index 8148b0f..faa1c78 100644 --- a/rules/libpcre.make +++ b/rules/libpcre.make @@ -66,6 +66,11 @@ endif ifdef PTXCONF_LIBPCRE_LIBPCRECPP @$(call install_lib, libpcre, 0, 0, 0644, libpcrecpp) endif + +ifdef PTXCONF_LIBPCRE_PCREGREP + @$(call install_copy, libpcre, 0, 0, 0755, -, /usr/bin/pcregrep) +endif + @$(call install_finish, libpcre) @$(call touch) -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-07-27 13:29 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-07-25 19:41 [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 Bernhard Walle 2012-07-25 19:41 ` [ptxdist] [PATCH 2/3] libpcre: Add option to enable libbz2 for pcregrep Bernhard Walle 2012-07-25 21:07 ` Michael Olbrich 2012-07-26 19:47 ` [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 Bernhard Walle 2012-07-26 19:47 ` [ptxdist] [PATCH 2/3] libpcre: Add option to enable libbz2 for pcregrep Bernhard Walle 2012-07-26 19:47 ` [ptxdist] [PATCH 3/3] libpcre: Allow installation of pcregrep Bernhard Walle 2012-07-27 13:29 ` [ptxdist] [PATCH 1/3] libpcre: version bump 8.00 -> 8.31 Michael Olbrich 2012-07-25 19:41 ` [ptxdist] [PATCH 3/3] libpcre: Allow installation of pcregrep Bernhard Walle
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox