Gentoo Archives: gentoo-commits

From: Adam Feldman <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Wed, 19 Aug 2020 19:55:09
Message-Id: 1597866878.f59be307fbc5ef4d693ebde8cbcce6b63cb6304f.np-hardass@gentoo
1 commit: f59be307fbc5ef4d693ebde8cbcce6b63cb6304f
2 Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 1 18:27:17 2020 +0000
4 Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 19 19:54:38 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f59be307
7
8 mate.eclass: drop static-libs whenever possible
9
10 Whenever package doesn't have static-libs available and selected,
11 if configure script has static-libs selectable, explicitly disable
12
13 Bug: https://bugs.gentoo.org/695878
14 Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
15
16 eclass/mate.eclass | 12 +++++++++++-
17 1 file changed, 11 insertions(+), 1 deletion(-)
18
19 diff --git a/eclass/mate.eclass b/eclass/mate.eclass
20 index db511aedb1f..3dea7bd7d6f 100644
21 --- a/eclass/mate.eclass
22 +++ b/eclass/mate.eclass
23 @@ -115,7 +115,17 @@ mate_src_prepare() {
24 # MATE specific configure handling
25 # Stub to gnome2_src_configure()
26 mate_src_configure() {
27 - gnome2_src_configure "$@"
28 +
29 + local mateconf=()
30 +
31 + # Pass --disable-static whenever possible
32 + if ! use_if_iuse static-libs; then
33 + if grep -q "enable-static" "${ECONF_SOURCE:-.}"/configure; then
34 + mateconf+=( --disable-static )
35 + fi
36 + fi
37 +
38 + gnome2_src_configure "${mateconf[@]} $@"
39 }
40
41 # @FUNCTION: mate_src_install