pcre2: new package, required by Qt 5.9
PATCH 1/2 pcre2: new package, required by Qt 5.9
This patch has been provided by Naoki Matsumoto
https://patchwork.ozlabs.org/patch/781474/
--- package/Config.in | 1 + package/pcre2/Config.in | 22 ++++++++++++++++++++++ package/pcre2/pcre2.hash | 2 ++ package/pcre2/pcre2.mk | 20 ++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 package/pcre2/Config.in create mode 100644 package/pcre2/pcre2.hash create mode 100644 package/pcre2/pcre2.mk
package/Config.in +1 -0
@@ -1488,6 +1488,7 @@ menu "Text and terminal handling" source "package/ncurses/Config.in" source "package/pcre/Config.in" + source "package/pcre2/Config.in" source "package/popt/Config.in" source "package/readline/Config.in" source "package/slang/Config.in"
package/pcre2/Config.in new file +22 -0
@@ -0,0 +1,22 @@ +config BR2_PACKAGE_PCRE2 + bool "pcre2" + help + Perl Compatible Regular Expressions. By default, only the + 8-bits libpcre2 is built. To get the 16-bits and/or 32-bits + variants libpcre2-16/libpcre2-32, use the package sub-options. + + http://www.pcre.org/ + +if BR2_PACKAGE_PCRE2 + +config BR2_PACKAGE_PCRE2_16 + bool "16-bit pcre2" + help + This option builds the 16-bits pcre2 library, i.e 'libpcre2-16' + +config BR2_PACKAGE_PCRE2_32 + bool "32-bit pcre2" + help + This option builds the 32-bits pcre2 library, i.e 'libpcre2-32' + +endif
package/pcre2/pcre2.hash new file +2 -0
@@ -0,0 +1,2 @@ +# Locally calculated after checking pgp signature +sha256 dfc79b918771f02d33968bd34a749ad7487fa1014aeb787fad29dd392b78c56e pcre2-10.23.tar.bz2
package/pcre2/pcre2.mk new file +20 -0
@@ -0,0 +1,20 @@ +################################################################################ +# +# pcre2 +# +################################################################################ + +PCRE2_VERSION = 10.23 +PCRE2_SITE = https://ftp.pcre.org/pub/pcre +PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 +PCRE2_LICENSE = BSD-3-Clause +PCRE2_LICENSE_FILES = LICENCE +PCRE2_INSTALL_STAGING = YES +PCRE2_CONFIG_SCRIPTS = pcre2-config + +PCRE2_CONF_OPTS += --enable-pcre2-8 +PCRE2_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE2_16),--enable-pcre2-16,--disable-pcre2-16) +PCRE2_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE2_32),--enable-pcre2-32,--disable-pcre2-32) + +$(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 1 line
1.9.1
PATCH 1/2 pcre2: new package, required by Qt 5.9
Hi Brent,
We don't usually put something like "required by Qt 5.9" in the subject line.
It's obvious because it's part of a series.
Quoted 2 lines · Brent Sink
This patch has been provided by Naoki Matsumoto
https://patchwork.ozlabs.org/patch/781474/
No need to reference the original. However, you should keep the original author
(unless it has changed so much that there is not much contribution left by the original author - definitely not the case here). You can fix that in git by doing "git commit --amend --author='...'".
Quoted 3 lines
Signed-off-by Brent Sink <[email protected]>Signed-off-by Naoki Matsumoto <[email protected]>
[snip]
package/Config.in menu "Text and terminal handling" · line 1490
Quoted 8 lines
package/Config.in +1
-0@@ -1488,6 +1488,7 @@ menu "Text and terminal handling" source "package/ncurses/Config.in" source "package/pcre/Config.in" + source "package/pcre2/Config.in"
This hunk is not valid: there is a line of context missing. Did you manually
edit it?
Quoted 3 lines
package/Config.in +0
-0source "package/popt/Config.in" source "package/readline/Config.in" source "package/slang/Config.in"
[snip]
package/pcre2/pcre2.hash line 1
Quoted 7 lines
package/pcre2/pcre2.hash new file +1
-0@@ -0,0 +1,2 @@ +# Locally calculated after checking pgp signature
Also mention where you got that signature:
# Locally calculated after checking
https://ftp.pcre.org/pub/pcre/pcre2-10.23.tar.bz2.sig
Quoted 14 lines
package/pcre2/pcre2.hash new file +1
-0+sha256 dfc79b918771f02d33968bd34a749ad7487fa1014aeb787fad29dd392b78c56e pcre2-10.23.tar.bz2package/pcre2/pcre2.mk new file +7
-0@@ -0,0 +1,20 @@ +################################################################################ +# +# pcre2 +# +################################################################################ + +PCRE2_VERSION = 10.23
package/pcre2/pcre2.mk line 17
Quoted 10 lines
package/pcre2/pcre2.mk new file +10
-0+PCRE2_SITE = https://ftp.pcre.org/pub/pcre +PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 +PCRE2_LICENSE = BSD-3-Clause +PCRE2_LICENSE_FILES = LICENCE +PCRE2_INSTALL_STAGING = YES +PCRE2_CONFIG_SCRIPTS = pcre2-config + +PCRE2_CONF_OPTS += --enable-pcre2-8 +PCRE2_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE2_16),--enable-pcre2-16,--disable-pcre2-16) +PCRE2_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE2_32),--enable-pcre2-32,--disable-pcre2-32)
It also has optional dependencies for zlib, bzip2, readline and libedit. So you
could add code like:
ifeq ($(BR2_PACKAGE_ZLIB),y)PCRE2_DEPENDENCIES += zlibPCRE2_CONF_OPTS += --enable-pcre2grep-libz
elsePCRE2_CONF_OPTS += --disable-pcre2grep-libz
endif
However, in this case, it seems to be really optional, i.e. it will never
automatically enable those options just because the library is available. So it's also OK as it is.
So everything is OK except for the authorship, the reference to the signature
and the fact that the patch is broken. With those things fixed you can add my:
Regards,
Arnout
Quoted 4 lines
package/pcre2/pcre2.mk new file +3
-0+ +$(eval $(autotools-package)) +$(eval $(host-autotools-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 1/2 pcre2: new package, required by Qt 5.9
Hello,
Quoted 4 lines · Arnout Vandecappelle
So everything is OK except for the authorship, the reference to the signature
and the fact that the patch is broken. With those things fixed you can add my:
One thing you forgot is the entry to the DEVELOPERS file.
Also, another thing I'm noticing now is that a host variant of pcre2 was added, and I don't see it used anywhere in the Qt 5.9 bump.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 1/2 pcre2: new package, required by Qt 5.9
In reply to Brent SinkHello,
Quoted 5 lines · Brent Sink
This patch has been provided by Naoki Matsumoto
https://patchwork.ozlabs.org/patch/781474/Signed-off-by Brent Sink <[email protected]>Signed-off-by Naoki Matsumoto <[email protected]>
Quoted 9 lines
--- package/Config.in | 1 + package/pcre2/Config.in | 22 ++++++++++++++++++++++ package/pcre2/pcre2.hash | 2 ++ package/pcre2/pcre2.mk | 20 ++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 package/pcre2/Config.in create mode 100644 package/pcre2/pcre2.hash create mode 100644 package/pcre2/pcre2.mk
I've applied, after doing the following changes:
[Thomas:
- reassign authorship to Naoki Matsumoto
- add entry to DEVELOPERS file
- fix broken patch
- add comment about where the PGP signature was coming from]
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com