* [ptxdist] [PATCH 1/2] libpcre: fix whitespace
@ 2019-06-25 9:43 Roland Hieber
2019-06-25 9:43 ` [ptxdist] [PATCH 2/2] libpcre: version bump 8.40 -> 8.43 Roland Hieber
0 siblings, 1 reply; 3+ messages in thread
From: Roland Hieber @ 2019-06-25 9:43 UTC (permalink / raw)
To: PTXdist Mailing List; +Cc: Roland Hieber
Replace 7 spaces by 1 tab.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/libpcre.in | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/rules/libpcre.in b/rules/libpcre.in
index 33af3cf032f6..f19122126ea5 100644
--- a/rules/libpcre.in
+++ b/rules/libpcre.in
@@ -19,25 +19,25 @@ menuconfig LIBPCRE
if LIBPCRE
config LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF
- bool "Enable NL is any CRLF"
+ bool "Enable NL is any CRLF"
config LIBPCRE_ENABLE_PCREGREP_LIBZ
- bool "Enable grep libz"
+ bool "Enable grep libz"
config LIBPCRE_ENABLE_PCREGREP_LIBBZ2
- bool "Enable grep libbz2"
+ bool "Enable grep libbz2"
config LIBPCRE_ENABLE_UTF8
- bool "Enable UTF8"
+ bool "Enable UTF8"
config LIBPCRE_LIBPCREPOSIX
- bool "install libpcreposix"
+ bool "install libpcreposix"
config LIBPCRE_LIBPCRECPP
- bool "install libpcrecpp (c++ bindings for libpcre)"
+ bool "install libpcrecpp (c++ bindings for libpcre)"
config LIBPCRE_PCREGREP
- select LIBPCRE_LIBPCREPOSIX
- bool "install pcregrep on the target"
+ select LIBPCRE_LIBPCREPOSIX
+ bool "install pcregrep on the target"
endif
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* [ptxdist] [PATCH 2/2] libpcre: version bump 8.40 -> 8.43
2019-06-25 9:43 [ptxdist] [PATCH 1/2] libpcre: fix whitespace Roland Hieber
@ 2019-06-25 9:43 ` Roland Hieber
2019-06-26 5:19 ` Michael Olbrich
0 siblings, 1 reply; 3+ messages in thread
From: Roland Hieber @ 2019-06-25 9:43 UTC (permalink / raw)
To: PTXdist Mailing List; +Cc: Roland Hieber
Also pin down all config options, choosing configure's defaults where no
kconfig options exist, and make the newline option more clear.
configure errors if we set both --enable-utf and --enable-utf8, so set
only one of them:
configure: error: --enable/disable-utf8 is kept only for compatibility
reasons and its value is copied to --enable/disable-utf. Newer code
must use --enable/disable-utf alone.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/libpcre.in | 3 +++
rules/libpcre.make | 41 ++++++++++++++++++++++++++++++++---------
2 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/rules/libpcre.in b/rules/libpcre.in
index f19122126ea5..9d664a248108 100644
--- a/rules/libpcre.in
+++ b/rules/libpcre.in
@@ -20,6 +20,9 @@ if LIBPCRE
config LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF
bool "Enable NL is any CRLF"
+ help
+ If true, any CR/LF combination is interpreted as a newline.
+ If false, only LF is interpreted as a newline.
config LIBPCRE_ENABLE_PCREGREP_LIBZ
bool "Enable grep libz"
diff --git a/rules/libpcre.make b/rules/libpcre.make
index ca56b3593a48..f7c630064f8c 100644
--- a/rules/libpcre.make
+++ b/rules/libpcre.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBPCRE) += libpcre
#
# Paths and names
#
-LIBPCRE_VERSION := 8.40
-LIBPCRE_MD5 := 41a842bf7dcecd6634219336e2167d1d
+LIBPCRE_VERSION := 8.43
+LIBPCRE_MD5 := 636222e79e392c3d95dcc545f24f98c4
LIBPCRE := pcre-$(LIBPCRE_VERSION)
LIBPCRE_SUFFIX := tar.bz2
LIBPCRE_URL := $(call ptx/mirror, SF, pcre/$(LIBPCRE).$(LIBPCRE_SUFFIX))
@@ -34,16 +34,39 @@ LIBPCRE_LICENSE_FILES := file://LICENCE;md5=60da32d84d067f53e22071c4ecb4384d
#
# autoconf
#
-LIBPCRE_AUTOCONF := \
+LIBPCRE_CONF_TOOL := autoconf
+LIBPCRE_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ --enable-pcre8 \
+ --enable-pcre16 \
+ --enable-pcre32 \
+ --$(call ptx/endis, PTXCONF_LIBPCRE_LIBPCRECPP)-cpp \
+ --disable-jit \
+ --enable-pcregrep-jit \
+ --disable-rebuild-chartables \
+ --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_UTF8)-utf \
+ --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_UTF8)-unicode-properties \
+ --disable-newline-is-cr \
+ --$(call ptx/disen, PTXCONF_LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF)-newline-is-lf \
+ --disable-newline-is-crlf \
+ --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF)-newline-is-anycrlf \
+ --disable-newline-is-any \
+ --disable-bsr-anycrlf \
+ --disable-ebcdic \
+ --disable-ebcdic-nl25 \
+ --enable-stack-for-recursion \
--$(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 \
- --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_UTF8)-unicode-properties \
-
-ifdef PTXCONF_LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF
-LIBPCRE_AUTOCONF += --enable-newline-is-anycrlf
-endif
+ --disable-pcretest-libedit \
+ --disable-pcretest-libreadline \
+ --disable-valgrind \
+ --disable-coverage \
+ --with-pcregrep-bufsize=20480 \
+ --with-posix-malloc-threshold=10 \
+ --with-link-size=2 \
+ --with-parens-nest-limit=250 \
+ --with-match-limit=10000000 \
+ --with-match-limit-recursion=10000000
# ----------------------------------------------------------------------------
# Target-Install
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH 2/2] libpcre: version bump 8.40 -> 8.43
2019-06-25 9:43 ` [ptxdist] [PATCH 2/2] libpcre: version bump 8.40 -> 8.43 Roland Hieber
@ 2019-06-26 5:19 ` Michael Olbrich
0 siblings, 0 replies; 3+ messages in thread
From: Michael Olbrich @ 2019-06-26 5:19 UTC (permalink / raw)
To: ptxdist
On Tue, Jun 25, 2019 at 11:43:59AM +0200, Roland Hieber wrote:
> Also pin down all config options, choosing configure's defaults where no
> kconfig options exist, and make the newline option more clear.
>
> configure errors if we set both --enable-utf and --enable-utf8, so set
> only one of them:
>
> configure: error: --enable/disable-utf8 is kept only for compatibility
> reasons and its value is copied to --enable/disable-utf. Newer code
> must use --enable/disable-utf alone.
>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> rules/libpcre.in | 3 +++
> rules/libpcre.make | 41 ++++++++++++++++++++++++++++++++---------
> 2 files changed, 35 insertions(+), 9 deletions(-)
>
> diff --git a/rules/libpcre.in b/rules/libpcre.in
> index f19122126ea5..9d664a248108 100644
> --- a/rules/libpcre.in
> +++ b/rules/libpcre.in
> @@ -20,6 +20,9 @@ if LIBPCRE
>
> config LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF
> bool "Enable NL is any CRLF"
> + help
> + If true, any CR/LF combination is interpreted as a newline.
> + If false, only LF is interpreted as a newline.
>
> config LIBPCRE_ENABLE_PCREGREP_LIBZ
> bool "Enable grep libz"
> diff --git a/rules/libpcre.make b/rules/libpcre.make
> index ca56b3593a48..f7c630064f8c 100644
> --- a/rules/libpcre.make
> +++ b/rules/libpcre.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBPCRE) += libpcre
> #
> # Paths and names
> #
> -LIBPCRE_VERSION := 8.40
> -LIBPCRE_MD5 := 41a842bf7dcecd6634219336e2167d1d
> +LIBPCRE_VERSION := 8.43
> +LIBPCRE_MD5 := 636222e79e392c3d95dcc545f24f98c4
Check the license. The md5 is now wrong. Add a comment to the commit
message as appropriate.
Michael
> LIBPCRE := pcre-$(LIBPCRE_VERSION)
> LIBPCRE_SUFFIX := tar.bz2
> LIBPCRE_URL := $(call ptx/mirror, SF, pcre/$(LIBPCRE).$(LIBPCRE_SUFFIX))
> @@ -34,16 +34,39 @@ LIBPCRE_LICENSE_FILES := file://LICENCE;md5=60da32d84d067f53e22071c4ecb4384d
> #
> # autoconf
> #
> -LIBPCRE_AUTOCONF := \
> +LIBPCRE_CONF_TOOL := autoconf
> +LIBPCRE_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> + --enable-pcre8 \
> + --enable-pcre16 \
> + --enable-pcre32 \
> + --$(call ptx/endis, PTXCONF_LIBPCRE_LIBPCRECPP)-cpp \
> + --disable-jit \
> + --enable-pcregrep-jit \
> + --disable-rebuild-chartables \
> + --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_UTF8)-utf \
> + --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_UTF8)-unicode-properties \
> + --disable-newline-is-cr \
> + --$(call ptx/disen, PTXCONF_LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF)-newline-is-lf \
> + --disable-newline-is-crlf \
> + --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF)-newline-is-anycrlf \
> + --disable-newline-is-any \
> + --disable-bsr-anycrlf \
> + --disable-ebcdic \
> + --disable-ebcdic-nl25 \
> + --enable-stack-for-recursion \
> --$(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 \
> - --$(call ptx/endis, PTXCONF_LIBPCRE_ENABLE_UTF8)-unicode-properties \
> -
> -ifdef PTXCONF_LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF
> -LIBPCRE_AUTOCONF += --enable-newline-is-anycrlf
> -endif
> + --disable-pcretest-libedit \
> + --disable-pcretest-libreadline \
> + --disable-valgrind \
> + --disable-coverage \
> + --with-pcregrep-bufsize=20480 \
> + --with-posix-malloc-threshold=10 \
> + --with-link-size=2 \
> + --with-parens-nest-limit=250 \
> + --with-match-limit=10000000 \
> + --with-match-limit-recursion=10000000
>
> # ----------------------------------------------------------------------------
> # Target-Install
> --
> 2.20.1
>
>
> _______________________________________________
> 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] 3+ messages in thread
end of thread, other threads:[~2019-06-26 5:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-25 9:43 [ptxdist] [PATCH 1/2] libpcre: fix whitespace Roland Hieber
2019-06-25 9:43 ` [ptxdist] [PATCH 2/2] libpcre: version bump 8.40 -> 8.43 Roland Hieber
2019-06-26 5:19 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox