[Buildroot] [PATCH 1/2] pcre2: new package, required by Qt 5.9

[Buildroot] [PATCH 1/2] pcre2: new package, required by Qt 5.9

[Brent Sink]

This patch has been provided by Naoki Matsumoto
https://patchwork.ozlabs.org/patch/781474/

Signed-off-by: Brent Sink <brents_3@hotmail.com>
Signed-off-by: Naoki Matsumoto <n-matsumoto@melcoinc.co.jp>
---
 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

diff --git a/package/Config.in b/package/Config.in
index f69f67f..bf75594 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -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"
diff --git a/package/pcre2/Config.in b/package/pcre2/Config.in
new file mode 100644
index 0000000..b49d306
--- /dev/null
+++ b/package/pcre2/Config.in
@@ -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
diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash
new file mode 100644
index 0000000..1232cf9
--- /dev/null
+++ b/package/pcre2/pcre2.hash
@@ -0,0 +1,2 @@
+# Locally calculated after checking pgp signature
+sha256	dfc79b918771f02d33968bd34a749ad7487fa1014aeb787fad29dd392b78c56e	pcre2-10.23.tar.bz2
diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk
new file mode 100644
index 0000000..5b7a163
--- /dev/null
+++ b/package/pcre2/pcre2.mk
@@ -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))
-- 
1.9.1

[Buildroot] [PATCH 1/2] pcre2: new package, required by Qt 5.9

[Arnout Vandecappelle]

 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.

On 07-07-17 05:45, Brent Sink wrote:
> 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='...'".

> 
> Signed-off-by: Brent Sink <brents_3@hotmail.com>
> Signed-off-by: Naoki Matsumoto <n-matsumoto@melcoinc.co.jp>
[snip]
> diff --git a/package/Config.in b/package/Config.in
> index f69f67f..bf75594 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -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?

>   	source "package/popt/Config.in"
>   	source "package/readline/Config.in"
>   	source "package/slang/Config.in"
[snip]
> diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash
> new file mode 100644
> index 0000000..1232cf9
> --- /dev/null
> +++ b/package/pcre2/pcre2.hash
> @@ -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

> +sha256	dfc79b918771f02d33968bd34a749ad7487fa1014aeb787fad29dd392b78c56e	pcre2-10.23.tar.bz2
> diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk
> new file mode 100644
> index 0000000..5b7a163
> --- /dev/null
> +++ b/package/pcre2/pcre2.mk
> @@ -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)

 It also has optional dependencies for zlib, bzip2, readline and libedit. So you
could add code like:

ifeq ($(BR2_PACKAGE_ZLIB),y)
PCRE2_DEPENDENCIES += zlib
PCRE2_CONF_OPTS += --enable-pcre2grep-libz
else
PCRE2_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:

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 Regards,
 Arnout

> +
> +$(eval $(autotools-package))
> +$(eval $(host-autotools-package))
> 

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

[Buildroot] [PATCH 1/2] pcre2: new package, required by Qt 5.9

[Thomas Petazzoni]

Hello,

On Fri, 7 Jul 2017 03:45:16 +0000, Brent Sink wrote:
> This patch has been provided by Naoki Matsumoto
> https://patchwork.ozlabs.org/patch/781474/
> 
> Signed-off-by: Brent Sink <brents_3@hotmail.com>
> Signed-off-by: Naoki Matsumoto <n-matsumoto@melcoinc.co.jp>
> ---
>  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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/2] pcre2: new package, required by Qt 5.9

[Thomas Petazzoni]

Hello,

On Sat, 8 Jul 2017 22:58:03 +0200, Arnout Vandecappelle wrote:

>  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:
> 
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com