mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] glib: drop internal_pcre option
@ 2021-11-22 13:36 Philipp Zabel
  2021-11-26 14:35 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Philipp Zabel @ 2021-11-22 13:36 UTC (permalink / raw)
  To: ptxdist

This option was removed in commit 9fbd7f3dc1f0 ("build: Drop the
internal_pcre option in favour of the subproject"), contained in
version 2.69.0.

Fixes: 20d3f539a7f8 ("glib: Version bump. 2.68.3 -> 2.70.0")
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/glib.make      | 1 -
 rules/host-glib.make | 1 -
 2 files changed, 2 deletions(-)

diff --git a/rules/glib.make b/rules/glib.make
index 13d397993eb2..ac65f8027d58 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -47,7 +47,6 @@ GLIB_CONF_OPT	:= \
 	-Dgtk_doc=false \
 	-Diconv=libc \
 	-Dinstalled_tests=false \
-	-Dinternal_pcre=false \
 	-Dlibelf=disabled \
 	-Dlibmount=$(call ptx/endis, PTXCONF_GLIB_LIBMOUNT)d \
 	-Dman=false \
diff --git a/rules/host-glib.make b/rules/host-glib.make
index ba80b70f2ab1..c062ad884c19 100644
--- a/rules/host-glib.make
+++ b/rules/host-glib.make
@@ -36,7 +36,6 @@ HOST_GLIB_CONF_OPT	:= \
 	-Dgtk_doc=false \
 	-Diconv=libc \
 	-Dinstalled_tests=false \
-	-Dinternal_pcre=false \
 	-Dlibelf=disabled \
 	-Dlibmount=disabled \
 	-Dman=false \
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [ptxdist] [APPLIED] glib: drop internal_pcre option
  2021-11-22 13:36 [ptxdist] [PATCH] glib: drop internal_pcre option Philipp Zabel
@ 2021-11-26 14:35 ` Michael Olbrich
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2021-11-26 14:35 UTC (permalink / raw)
  To: ptxdist; +Cc: Philipp Zabel

Thanks, applied as c2a935cceaf44dc325038b0118e5a7348a0951e0.

Michael

[sent from post-receive hook]

On Fri, 26 Nov 2021 15:35:17 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> This option was removed in commit 9fbd7f3dc1f0 ("build: Drop the
> internal_pcre option in favour of the subproject"), contained in
> version 2.69.0.
> 
> Fixes: 20d3f539a7f8 ("glib: Version bump. 2.68.3 -> 2.70.0")
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20211122133630.1771606-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/glib.make b/rules/glib.make
> index 13d397993eb2..ac65f8027d58 100644
> --- a/rules/glib.make
> +++ b/rules/glib.make
> @@ -47,7 +47,6 @@ GLIB_CONF_OPT	:= \
>  	-Dgtk_doc=false \
>  	-Diconv=libc \
>  	-Dinstalled_tests=false \
> -	-Dinternal_pcre=false \
>  	-Dlibelf=disabled \
>  	-Dlibmount=$(call ptx/endis, PTXCONF_GLIB_LIBMOUNT)d \
>  	-Dman=false \
> diff --git a/rules/host-glib.make b/rules/host-glib.make
> index ba80b70f2ab1..c062ad884c19 100644
> --- a/rules/host-glib.make
> +++ b/rules/host-glib.make
> @@ -36,7 +36,6 @@ HOST_GLIB_CONF_OPT	:= \
>  	-Dgtk_doc=false \
>  	-Diconv=libc \
>  	-Dinstalled_tests=false \
> -	-Dinternal_pcre=false \
>  	-Dlibelf=disabled \
>  	-Dlibmount=disabled \
>  	-Dman=false \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-11-26 14:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-22 13:36 [ptxdist] [PATCH] glib: drop internal_pcre option Philipp Zabel
2021-11-26 14:35 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox