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