[gentoo-dev] [PATCH 1/3] meson.eclass: introduce meson_install helper function

[gentoo-dev] [PATCH 1/3] meson.eclass: introduce meson_install helper function

[Mike Gilbert]

This will be called from meson.eclass and meson-multilib.eclass.

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

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 8b22797da71..a3cf8740b26 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -404,11 +404,11 @@ meson_src_test() {
 	"$@" || die "tests failed"
 }
 
-# @FUNCTION: meson_src_install
+# @FUNCTION: meson_install
 # @USAGE: [extra meson install arguments]
 # @DESCRIPTION:
-# This is the meson_src_install function.
-meson_src_install() {
+# Calls meson install with suitable arguments
+meson_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
 	local mesoninstallargs=(
@@ -420,10 +420,17 @@ meson_src_install() {
 	set -- meson install "${mesoninstallargs[@]}"
 	echo "$@" >&2
 	"$@" || die "install failed"
+}
+
+# @FUNCTION: meson_src_install
+# @USAGE: [extra meson install arguments]
+# @DESCRIPTION:
+# This is the meson_src_install function.
+meson_src_install() {
+	debug-print-function ${FUNCNAME} "$@"
 
-	pushd "${S}" > /dev/null || die
+	meson_install "$@"
 	einstalldocs
-	popd > /dev/null || die
 }
 
 fi
-- 
2.33.0

[gentoo-dev] [PATCH 2/3] meson-multilib.eclass: use meson_install helper function

[Mike Gilbert]

Use meson_install to avoid calling einstalldocs more than once.
multilib-minimal_src_install already handles it.

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 eclass/meson-multilib.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/meson-multilib.eclass b/eclass/meson-multilib.eclass
index fc1ef5802f9..83c5202d069 100644
--- a/eclass/meson-multilib.eclass
+++ b/eclass/meson-multilib.eclass
@@ -125,7 +125,7 @@ meson-multilib_src_install() {
 }
 
 multilib_src_install() {
-	meson_src_install "${_meson_args[@]}"
+	meson_install "${_meson_args[@]}"
 }
 
 fi
-- 
2.33.0

[gentoo-dev] [PATCH 3/3] meson-multilib.eclass: fix MAINTAINER and AUTHOR tags

[Mike Gilbert]

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

diff --git a/eclass/meson-multilib.eclass b/eclass/meson-multilib.eclass
index 83c5202d069..1ed95f99fa1 100644
--- a/eclass/meson-multilib.eclass
+++ b/eclass/meson-multilib.eclass
@@ -3,10 +3,10 @@
 
 # @ECLASS: meson-multilib.eclass
 # @MAINTAINER:
-# Author: Matt Turner <mattst88@gentoo.org>
+# Matt Turner <mattst88@gentoo.org>
 # @AUTHOR:
-# Author: Michał Górny <mgorny@gentoo.org>
-# Author: Matt Turner <mattst88@gentoo.org>
+# Michał Górny <mgorny@gentoo.org>
+# Matt Turner <mattst88@gentoo.org>
 # @SUPPORTED_EAPIS: 7 8
 # @BLURB: meson wrapper for multilib builds
 # @DESCRIPTION:
-- 
2.33.0

[gentoo-dev] Re: [PATCH 1/3] meson.eclass: introduce meson_install helper function

[Matt Turner]

Thanks, all three patches LGTM.