| 1 |
On Sat, 2020-08-01 at 14:32 -0400, Adam Feldman wrote: |
| 2 |
> Whenever package doesn't have static-libs available and selected, |
| 3 |
> if configure script has static-libs selectable, explicitly disable |
| 4 |
> |
| 5 |
> Bug: https://bugs.gentoo.org/695878 |
| 6 |
> --- |
| 7 |
> eclass/mate.eclass | 12 +++++++++++- |
| 8 |
> 1 file changed, 11 insertions(+), 1 deletion(-) |
| 9 |
> |
| 10 |
> diff --git a/eclass/mate.eclass b/eclass/mate.eclass |
| 11 |
> index db511aedb1f1..d6718872c05d 100644 |
| 12 |
> --- a/eclass/mate.eclass |
| 13 |
> +++ b/eclass/mate.eclass |
| 14 |
> @@ -115,7 +115,17 @@ mate_src_prepare() { |
| 15 |
> # MATE specific configure handling |
| 16 |
> # Stub to gnome2_src_configure() |
| 17 |
> mate_src_configure() { |
| 18 |
> - gnome2_src_configure "$@" |
| 19 |
> + |
| 20 |
> + local mateconf=() |
| 21 |
> + |
| 22 |
> + # Pass --disable-static whenever possible |
| 23 |
> + if ! use_if_iuse static-libs; then |
| 24 |
> + if grep -q "enable-static" "${ECONF_SOURCE:-.}"/configure; then |
| 25 |
> + mateconf+=( --disable-static ) |
| 26 |
> + fi |
| 27 |
> + fi |
| 28 |
> + |
| 29 |
> + gnome2_src_configure ${mateconf[@]} "$@" |
| 30 |
|
| 31 |
"${mateconf[@]}". Using [@] without quoting makes no sense, and I'm |
| 32 |
sure linters will complain. |
| 33 |
|
| 34 |
> } |
| 35 |
> |
| 36 |
> # @FUNCTION: mate_src_install |
| 37 |
|
| 38 |
-- |
| 39 |
Best regards, |
| 40 |
Michał Górny |
Archives