[gentoo-dev] [PATCH 1/3] meson.eclass: use python eselect module in _meson_env_array

[gentoo-dev] [PATCH 1/3] meson.eclass: use python eselect module in _meson_env_array

[Mike Gilbert]

Closes: https://bugs.gentoo.org/759433
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 eclass/meson.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 21338280df33..6296f1dd26e5 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -126,7 +126,8 @@ EOF
 #          '--unicode-16=𐐷', '--unicode-32=𐤅']
 #
 _meson_env_array() {
-	python -c "${__MESON_ARRAY_PARSER}" "$@"
+	local python="$(eselect python show)"
+	${python} -c "${__MESON_ARRAY_PARSER}" "$@"
 }
 
 # @FUNCTION: _meson_get_machine_info
-- 
2.30.0.rc0

[gentoo-dev] [PATCH 2/3] meson.eclass: make meson_env_array public

[Mike Gilbert]

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 eclass/meson.eclass | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 6296f1dd26e5..7bd4b7ec8395 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -107,8 +107,8 @@ print("[{}]".format(
 	", ".join([quote(x) for x in shlex.split(" ".join(sys.argv[1:]))])))
 EOF
 
-# @FUNCTION: _meson_env_array
-# @INTERNAL
+# @FUNCTION: meson_env_array
+# @USAGE: <shell-compatible argument string> ...
 # @DESCRIPTION:
 # Parses the command line flags and converts them into an array suitable for
 # use in a cross file.
@@ -125,7 +125,7 @@ EOF
 #          '--full-word-backslash=Hello World', '--simple', '--unicode-8=©',
 #          '--unicode-16=𐐷', '--unicode-32=𐤅']
 #
-_meson_env_array() {
+meson_env_array() {
 	local python="$(eselect python show)"
 	${python} -c "${__MESON_ARRAY_PARSER}" "$@"
 }
@@ -174,29 +174,29 @@ _meson_create_cross_file() {
 
 	cat > "${fn}" <<-EOF
 	[binaries]
-	ar = $(_meson_env_array "$(tc-getAR)")
-	c = $(_meson_env_array "$(tc-getCC)")
-	cpp = $(_meson_env_array "$(tc-getCXX)")
-	fortran = $(_meson_env_array "$(tc-getFC)")
+	ar = $(meson_env_array "$(tc-getAR)")
+	c = $(meson_env_array "$(tc-getCC)")
+	cpp = $(meson_env_array "$(tc-getCXX)")
+	fortran = $(meson_env_array "$(tc-getFC)")
 	llvm-config = '$(tc-getPROG LLVM_CONFIG llvm-config)'
-	nm = $(_meson_env_array "$(tc-getNM)")
-	objc = $(_meson_env_array "$(tc-getPROG OBJC cc)")
-	objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)")
+	nm = $(meson_env_array "$(tc-getNM)")
+	objc = $(meson_env_array "$(tc-getPROG OBJC cc)")
+	objcpp = $(meson_env_array "$(tc-getPROG OBJCXX c++)")
 	pkgconfig = '$(tc-getPKG_CONFIG)'
-	strip = $(_meson_env_array "$(tc-getSTRIP)")
-	windres = $(_meson_env_array "$(tc-getRC)")
+	strip = $(meson_env_array "$(tc-getSTRIP)")
+	windres = $(meson_env_array "$(tc-getRC)")
 
 	[properties]
-	c_args = $(_meson_env_array "${CFLAGS} ${CPPFLAGS}")
-	c_link_args = $(_meson_env_array "${CFLAGS} ${LDFLAGS}")
-	cpp_args = $(_meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
-	cpp_link_args = $(_meson_env_array "${CXXFLAGS} ${LDFLAGS}")
-	fortran_args = $(_meson_env_array "${FCFLAGS}")
-	fortran_link_args = $(_meson_env_array "${FCFLAGS} ${LDFLAGS}")
-	objc_args = $(_meson_env_array "${OBJCFLAGS} ${CPPFLAGS}")
-	objc_link_args = $(_meson_env_array "${OBJCFLAGS} ${LDFLAGS}")
-	objcpp_args = $(_meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}")
-	objcpp_link_args = $(_meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}")
+	c_args = $(meson_env_array "${CFLAGS} ${CPPFLAGS}")
+	c_link_args = $(meson_env_array "${CFLAGS} ${LDFLAGS}")
+	cpp_args = $(meson_env_array "${CXXFLAGS} ${CPPFLAGS}")
+	cpp_link_args = $(meson_env_array "${CXXFLAGS} ${LDFLAGS}")
+	fortran_args = $(meson_env_array "${FCFLAGS}")
+	fortran_link_args = $(meson_env_array "${FCFLAGS} ${LDFLAGS}")
+	objc_args = $(meson_env_array "${OBJCFLAGS} ${CPPFLAGS}")
+	objc_link_args = $(meson_env_array "${OBJCFLAGS} ${LDFLAGS}")
+	objcpp_args = $(meson_env_array "${OBJCXXFLAGS} ${CPPFLAGS}")
+	objcpp_link_args = $(meson_env_array "${OBJCXXFLAGS} ${LDFLAGS}")
 	needs_exe_wrapper = true
 	sys_root = '${SYSROOT}'
 	pkg_config_libdir = '${PKG_CONFIG_LIBDIR:-${EPREFIX}/usr/$(get_libdir)/pkgconfig}'
-- 
2.30.0.rc0

[gentoo-dev] [PATCH 3/3] app-emulation/gallium-nine-standalone: update meson_env_array refereneces

[Mike Gilbert]

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 .../gallium-nine-standalone-0.7.ebuild                        | 4 ++--
 .../gallium-nine-standalone-9999.ebuild                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
index 3e96326a2fc8..1f833e7646b6 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
@@ -65,8 +65,8 @@ src_prepare() {
 
 		sed \
 			-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
-			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+			-e "s!@CFLAGS@!$(meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
+			-e "s!@LDFLAGS@!$(meson_env_array "${LDFLAGS}")!" \
 			-e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
 			${file}.in > ${file} || die
 	}
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
index 3e96326a2fc8..1f833e7646b6 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -65,8 +65,8 @@ src_prepare() {
 
 		sed \
 			-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
-			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+			-e "s!@CFLAGS@!$(meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
+			-e "s!@LDFLAGS@!$(meson_env_array "${LDFLAGS}")!" \
 			-e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
 			${file}.in > ${file} || die
 	}
-- 
2.30.0.rc0

Re: [gentoo-dev] [PATCH 1/3] meson.eclass: use python eselect module in _meson_env_array

[Michał Górny]

On Thu, 2020-12-17 at 16:30 -0500, Mike Gilbert wrote:
> Closes: https://bugs.gentoo.org/759433
> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
> ---
>  eclass/meson.eclass | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/eclass/meson.eclass b/eclass/meson.eclass
> index 21338280df33..6296f1dd26e5 100644
> --- a/eclass/meson.eclass
> +++ b/eclass/meson.eclass
> @@ -126,7 +126,8 @@ EOF
>  #          '--unicode-16=𐐷', '--unicode-32=𐤅']
>  #
>  _meson_env_array() {
> -       python -c "${__MESON_ARRAY_PARSER}" "$@"
> +       local python="$(eselect python show)"
> +       ${python} -c "${__MESON_ARRAY_PARSER}" "$@"
>  }
>  
>  # @FUNCTION: _meson_get_machine_info

You're missing a BDEPEND on app-eselect/eselect-python.

Also, I really don't like these workarounds.  It takes a lot of effort
to figure out how to break stuff, so people stop doing awful things. 
It's disrespectful to my time when you invent new hacks.  Now I'll have
to figure out how to change eselect-python to break it.

-- 
Best regards,
Michał Górny

Re: [gentoo-dev] [PATCH 1/3] meson.eclass: use python eselect module in _meson_env_array

[Mike Gilbert]

On Thu, Dec 17, 2020 at 4:44 PM Michał Górny <mgorny@gentoo.org> wrote:
>
> On Thu, 2020-12-17 at 16:30 -0500, Mike Gilbert wrote:
> > Closes: https://bugs.gentoo.org/759433
> > Signed-off-by: Mike Gilbert <floppym@gentoo.org>
> > ---
> >  eclass/meson.eclass | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/eclass/meson.eclass b/eclass/meson.eclass
> > index 21338280df33..6296f1dd26e5 100644
> > --- a/eclass/meson.eclass
> > +++ b/eclass/meson.eclass
> > @@ -126,7 +126,8 @@ EOF
> >  #          '--unicode-16=𐐷', '--unicode-32=𐤅']
> >  #
> >  _meson_env_array() {
> > -       python -c "${__MESON_ARRAY_PARSER}" "$@"
> > +       local python="$(eselect python show)"
> > +       ${python} -c "${__MESON_ARRAY_PARSER}" "$@"
> >  }
> >
> >  # @FUNCTION: _meson_get_machine_info
>
> You're missing a BDEPEND on app-eselect/eselect-python.
>
> Also, I really don't like these workarounds.  It takes a lot of effort
> to figure out how to break stuff, so people stop doing awful things.
> It's disrespectful to my time when you invent new hacks.  Now I'll have
> to figure out how to change eselect-python to break it.

Why is this such an awful thing to do?

The code should be able to execute with any version of python
currently supported by Gentoo.

Please don't assume that I'm trying to avoid a proper solution here.
Please suggest a better alternative if you have one.

Re: [gentoo-dev] [PATCH 1/3] meson.eclass: use python eselect module in _meson_env_array

[Michał Górny]

On Thu, 2020-12-17 at 16:50 -0500, Mike Gilbert wrote:
> On Thu, Dec 17, 2020 at 4:44 PM Michał Górny <mgorny@gentoo.org>
> wrote:
> > 
> > On Thu, 2020-12-17 at 16:30 -0500, Mike Gilbert wrote:
> > > Closes: https://bugs.gentoo.org/759433
> > > Signed-off-by: Mike Gilbert <floppym@gentoo.org>
> > > ---
> > >  eclass/meson.eclass | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/eclass/meson.eclass b/eclass/meson.eclass
> > > index 21338280df33..6296f1dd26e5 100644
> > > --- a/eclass/meson.eclass
> > > +++ b/eclass/meson.eclass
> > > @@ -126,7 +126,8 @@ EOF
> > >  #          '--unicode-16=𐐷', '--unicode-32=𐤅']
> > >  #
> > >  _meson_env_array() {
> > > -       python -c "${__MESON_ARRAY_PARSER}" "$@"
> > > +       local python="$(eselect python show)"
> > > +       ${python} -c "${__MESON_ARRAY_PARSER}" "$@"
> > >  }
> > > 
> > >  # @FUNCTION: _meson_get_machine_info
> > 
> > You're missing a BDEPEND on app-eselect/eselect-python.
> > 
> > Also, I really don't like these workarounds.  It takes a lot of
> > effort
> > to figure out how to break stuff, so people stop doing awful
> > things.
> > It's disrespectful to my time when you invent new hacks.  Now I'll
> > have
> > to figure out how to change eselect-python to break it.
> 
> Why is this such an awful thing to do?
> 
> The code should be able to execute with any version of python
> currently supported by Gentoo.
> 
> Please don't assume that I'm trying to avoid a proper solution here.
> Please suggest a better alternative if you have one.

I actually liked installing the script to the system.

-- 
Best regards,
Michał Górny

Re: [gentoo-dev] [PATCH 1/3] meson.eclass: use python eselect module in _meson_env_array

[William Hubbs]

[-- Attachment #1: Type: text/plain, Size: 2635 bytes --]

On Thu, Dec 17, 2020 at 10:58:23PM +0100, Michał Górny wrote:
> On Thu, 2020-12-17 at 16:50 -0500, Mike Gilbert wrote:
> > On Thu, Dec 17, 2020 at 4:44 PM Michał Górny <mgorny@gentoo.org>
> > wrote:
> > > 
> > > On Thu, 2020-12-17 at 16:30 -0500, Mike Gilbert wrote:
> > > > Closes: https://bugs.gentoo.org/759433
> > > > Signed-off-by: Mike Gilbert <floppym@gentoo.org>
> > > > ---
> > > >  eclass/meson.eclass | 3 ++-
> > > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > > 
> > > > diff --git a/eclass/meson.eclass b/eclass/meson.eclass
> > > > index 21338280df33..6296f1dd26e5 100644
> > > > --- a/eclass/meson.eclass
> > > > +++ b/eclass/meson.eclass
> > > > @@ -126,7 +126,8 @@ EOF
> > > >  #          '--unicode-16=𐐷', '--unicode-32=𐤅']
> > > >  #
> > > >  _meson_env_array() {
> > > > -       python -c "${__MESON_ARRAY_PARSER}" "$@"
> > > > +       local python="$(eselect python show)"
> > > > +       ${python} -c "${__MESON_ARRAY_PARSER}" "$@"
> > > >  }
> > > > 
> > > >  # @FUNCTION: _meson_get_machine_info
> > > 
> > > You're missing a BDEPEND on app-eselect/eselect-python.
> > > 
> > > Also, I really don't like these workarounds.  It takes a lot of
> > > effort
> > > to figure out how to break stuff, so people stop doing awful
> > > things.
> > > It's disrespectful to my time when you invent new hacks.  Now I'll
> > > have
> > > to figure out how to change eselect-python to break it.
> > 
> > Why is this such an awful thing to do?
> > 
> > The code should be able to execute with any version of python
> > currently supported by Gentoo.
> > 
> > Please don't assume that I'm trying to avoid a proper solution here.
> > Please suggest a better alternative if you have one.
> 
> I actually liked installing the script to the system.

If we are going to install it to the system, that should not be done by
dev-util/meson; it is a gentoo-specific script, so we should probably
create a separate package for it. Also, it is debatable whether that
script should be installed in a directory that is on the path.

I have major concerns about the native-symlinks use flag for python-exec.
It looks like turning this flag off would result in /usr/bin/python not being
installed which will cause massive breakage. This is similar to removing
/bin/sh., so I am strongly against the idea of this use flag unless
upstream python is recommending it. If they are not installing
/usr/bin/python in their native builds any longer, I'll be quiet.
Otherwise, imo this is a really bad idea for a use flag.

William

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

Re: [gentoo-dev] [PATCH 1/3] meson.eclass: use python eselect module in _meson_env_array

[Mike Gilbert]

On Sun, Dec 20, 2020 at 2:13 PM William Hubbs <williamh@gentoo.org> wrote:
>
> On Thu, Dec 17, 2020 at 10:58:23PM +0100, Michał Górny wrote:
> > On Thu, 2020-12-17 at 16:50 -0500, Mike Gilbert wrote:
> > > On Thu, Dec 17, 2020 at 4:44 PM Michał Górny <mgorny@gentoo.org>
> > > wrote:
> > > >
> > > > On Thu, 2020-12-17 at 16:30 -0500, Mike Gilbert wrote:
> > > > > Closes: https://bugs.gentoo.org/759433
> > > > > Signed-off-by: Mike Gilbert <floppym@gentoo.org>
> > > > > ---
> > > > >  eclass/meson.eclass | 3 ++-
> > > > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > > >
> > > > > diff --git a/eclass/meson.eclass b/eclass/meson.eclass
> > > > > index 21338280df33..6296f1dd26e5 100644
> > > > > --- a/eclass/meson.eclass
> > > > > +++ b/eclass/meson.eclass
> > > > > @@ -126,7 +126,8 @@ EOF
> > > > >  #          '--unicode-16=𐐷', '--unicode-32=𐤅']
> > > > >  #
> > > > >  _meson_env_array() {
> > > > > -       python -c "${__MESON_ARRAY_PARSER}" "$@"
> > > > > +       local python="$(eselect python show)"
> > > > > +       ${python} -c "${__MESON_ARRAY_PARSER}" "$@"
> > > > >  }
> > > > >
> > > > >  # @FUNCTION: _meson_get_machine_info
> > > >
> > > > You're missing a BDEPEND on app-eselect/eselect-python.
> > > >
> > > > Also, I really don't like these workarounds.  It takes a lot of
> > > > effort
> > > > to figure out how to break stuff, so people stop doing awful
> > > > things.
> > > > It's disrespectful to my time when you invent new hacks.  Now I'll
> > > > have
> > > > to figure out how to change eselect-python to break it.
> > >
> > > Why is this such an awful thing to do?
> > >
> > > The code should be able to execute with any version of python
> > > currently supported by Gentoo.
> > >
> > > Please don't assume that I'm trying to avoid a proper solution here.
> > > Please suggest a better alternative if you have one.
> >
> > I actually liked installing the script to the system.
>
> If we are going to install it to the system, that should not be done by
> dev-util/meson; it is a gentoo-specific script, so we should probably
> create a separate package for it. Also, it is debatable whether that
> script should be installed in a directory that is on the path.

I don't really want to create a separate package to install a single
file. dev-util/meson is just a convenient place to install it.

I think it is ok to install it in PATH, so long as it is unlikely to
conflict with other program names.

> I have major concerns about the native-symlinks use flag for python-exec.
> It looks like turning this flag off would result in /usr/bin/python not being
> installed which will cause massive breakage. This is similar to removing
> /bin/sh., so I am strongly against the idea of this use flag unless
> upstream python is recommending it. If they are not installing
> /usr/bin/python in their native builds any longer, I'll be quiet.
> Otherwise, imo this is a really bad idea for a use flag.

The native-symlinks flag exists to break things intentionally.

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bd5d2f9ea331119ea681e52ccaff1bce172ac98