[ptxdist] [PATCH] configure_helper: ignore new Meson 0.63 builtin options

[ptxdist] [PATCH] configure_helper: ignore new Meson 0.63 builtin options

[Philipp Zabel]

Ignore new Meson builtin options "pkgconfig.relocatable" and
"prefer_static" (since 0.63).

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 scripts/configure_helper.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/configure_helper.py b/scripts/configure_helper.py
index 86dee3416d08..f515f6e0b1bb 100755
--- a/scripts/configure_helper.py
+++ b/scripts/configure_helper.py
@@ -149,6 +149,8 @@ meson_blacklist = [
 	"mandir",
 	"optimization",
 	"pkg_config_path",
+	"pkgconfig.relocatable",
+	"prefer_static",
 	"python.install_env",
 	"python.platlibdir",
 	"python.purelibdir",
-- 
2.30.2

Re: [ptxdist] [PATCH] configure_helper: ignore new Meson 0.63 builtin options

[Michael Olbrich]

On Mon, Jan 09, 2023 at 02:46:16PM +0100, Philipp Zabel wrote:
> Ignore new Meson builtin options "pkgconfig.relocatable" and
> "prefer_static" (since 0.63).
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  scripts/configure_helper.py | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/scripts/configure_helper.py b/scripts/configure_helper.py
> index 86dee3416d08..f515f6e0b1bb 100755
> --- a/scripts/configure_helper.py
> +++ b/scripts/configure_helper.py
> @@ -149,6 +149,8 @@ meson_blacklist = [
>  	"mandir",
>  	"optimization",
>  	"pkg_config_path",
> +	"pkgconfig.relocatable",

Hmmm, if I understand this correctly then we may want to set this option to
true once we update to meson 0.63. I think we hack the .pc files afterwards
to do the same thing.

Michael

> +	"prefer_static",
>  	"python.install_env",
>  	"python.platlibdir",
>  	"python.purelibdir",
> -- 
> 2.30.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [ptxdist] [PATCH] configure_helper: ignore new Meson 0.63 builtin options

[Philipp Zabel]

On Di, 2023-01-10 at 09:02 +0100, Michael Olbrich wrote:
> On Mon, Jan 09, 2023 at 02:46:16PM +0100, Philipp Zabel wrote:
> > Ignore new Meson builtin options "pkgconfig.relocatable" and
> > "prefer_static" (since 0.63).
> > 
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> >  scripts/configure_helper.py | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/scripts/configure_helper.py b/scripts/configure_helper.py
> > index 86dee3416d08..f515f6e0b1bb 100755
> > --- a/scripts/configure_helper.py
> > +++ b/scripts/configure_helper.py
> > @@ -149,6 +149,8 @@ meson_blacklist = [
> >  	"mandir",
> >  	"optimization",
> >  	"pkg_config_path",
> > +	"pkgconfig.relocatable",
> 
> Hmmm, if I understand this correctly then we may want to set this option to
> true once we update to meson 0.63. I think we hack the .pc files afterwards
> to do the same thing.

https://lore.ptxdist.org/ptxdist/20230111101916.3749538-2-p.zabel@pengutronix.de/T/#u

regards
Philipp

Re: [ptxdist] [PATCH] configure_helper: ignore new Meson 0.63 builtin options

[Philipp Zabel]

On Mon, Jan 09, 2023 at 02:46:16PM +0100, Philipp Zabel wrote:
> Ignore new Meson builtin options "pkgconfig.relocatable" and
> "prefer_static" (since 0.63).
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

Looks like this one fell through the cracks.

As of commit f4c1eef53247 ("host-meson: version bump 0.61.4 -> 1.0.0")
we have Meson with these options available.

regards
Philipp

Re: [ptxdist] [PATCH] configure_helper: ignore new Meson 0.63 builtin options

[Michael Olbrich]

On Mon, Jan 30, 2023 at 10:37:44AM +0100, Philipp Zabel wrote:
> On Mon, Jan 09, 2023 at 02:46:16PM +0100, Philipp Zabel wrote:
> > Ignore new Meson builtin options "pkgconfig.relocatable" and
> > "prefer_static" (since 0.63).
> > 
> > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> 
> Looks like this one fell through the cracks.
> 
> As of commit f4c1eef53247 ("host-meson: version bump 0.61.4 -> 1.0.0")
> we have Meson with these options available.

pkgconfig.relocatable is added to the options, so it should not be needed
here. So this patch need updating.

Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |