[gentoo-dev] [PATCH] mate.eclass: drop static-libs whenever possible

[gentoo-dev] [PATCH] mate.eclass: drop static-libs whenever possible

[Adam Feldman]

Whenever package doesn't have static-libs available and selected,
if configure script has static-libs selectable, explicitly disable

Bug: https://bugs.gentoo.org/695878
---
 eclass/mate.eclass | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/eclass/mate.eclass b/eclass/mate.eclass
index db511aedb1f1..d6718872c05d 100644
--- a/eclass/mate.eclass
+++ b/eclass/mate.eclass
@@ -115,7 +115,17 @@ mate_src_prepare() {
 # MATE specific configure handling
 # Stub to gnome2_src_configure()
 mate_src_configure() {
-	gnome2_src_configure "$@"
+
+	local mateconf=()
+
+	# Pass --disable-static whenever possible
+	if ! use_if_iuse static-libs; then
+		if grep -q "enable-static" "${ECONF_SOURCE:-.}"/configure; then
+			mateconf+=( --disable-static )
+		fi
+	fi
+
+	gnome2_src_configure ${mateconf[@]} "$@"
 }
 
 # @FUNCTION: mate_src_install
-- 
2.26.2

Re: [gentoo-dev] [PATCH] mate.eclass: drop static-libs whenever possible

[Michał Górny]

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

On Sat, 2020-08-01 at 14:32 -0400, Adam Feldman wrote:
> Whenever package doesn't have static-libs available and selected,
> if configure script has static-libs selectable, explicitly disable
> 
> Bug: https://bugs.gentoo.org/695878
> ---
>  eclass/mate.eclass | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/eclass/mate.eclass b/eclass/mate.eclass
> index db511aedb1f1..d6718872c05d 100644
> --- a/eclass/mate.eclass
> +++ b/eclass/mate.eclass
> @@ -115,7 +115,17 @@ mate_src_prepare() {
>  # MATE specific configure handling
>  # Stub to gnome2_src_configure()
>  mate_src_configure() {
> -	gnome2_src_configure "$@"
> +
> +	local mateconf=()
> +
> +	# Pass --disable-static whenever possible
> +	if ! use_if_iuse static-libs; then
> +		if grep -q "enable-static" "${ECONF_SOURCE:-.}"/configure; then
> +			mateconf+=( --disable-static )
> +		fi
> +	fi
> +
> +	gnome2_src_configure ${mateconf[@]} "$@"

"${mateconf[@]}".  Using [@] without quoting makes no sense, and I'm
sure linters will complain.

>  }
>  
>  # @FUNCTION: mate_src_install

-- 
Best regards,
Michał Górny


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

Re: [gentoo-dev] [PATCH] mate.eclass: drop static-libs whenever possible

[Adam Feldman]

[-- Attachment #1.1: Type: text/plain, Size: 1334 bytes --]

On 8/1/20 4:25 PM, Michał Górny wrote:
> On Sat, 2020-08-01 at 14:32 -0400, Adam Feldman wrote:
>> Whenever package doesn't have static-libs available and selected,
>> if configure script has static-libs selectable, explicitly disable
>>
>> Bug: https://bugs.gentoo.org/695878
>> ---
>>  eclass/mate.eclass | 12 +++++++++++-
>>  1 file changed, 11 insertions(+), 1 deletion(-)
>>
>> diff --git a/eclass/mate.eclass b/eclass/mate.eclass
>> index db511aedb1f1..d6718872c05d 100644
>> --- a/eclass/mate.eclass
>> +++ b/eclass/mate.eclass
>> @@ -115,7 +115,17 @@ mate_src_prepare() {
>>  # MATE specific configure handling
>>  # Stub to gnome2_src_configure()
>>  mate_src_configure() {
>> -	gnome2_src_configure "$@"
>> +
>> +	local mateconf=()
>> +
>> +	# Pass --disable-static whenever possible
>> +	if ! use_if_iuse static-libs; then
>> +		if grep -q "enable-static" "${ECONF_SOURCE:-.}"/configure; then
>> +			mateconf+=( --disable-static )
>> +		fi
>> +	fi
>> +
>> +	gnome2_src_configure ${mateconf[@]} "$@"
> 
> "${mateconf[@]}".  Using [@] without quoting makes no sense, and I'm
> sure linters will complain.
> 
>>  }
>>  
>>  # @FUNCTION: mate_src_install
> 

Fixed.  Thanks for the review.

-- 
Thanks,

Adam Feldman
Gentoo Developer
NP-Hardass@gentoo.org
0x671C52F118F89C67


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [gentoo-dev] [PATCH] mate.eclass: drop static-libs whenever possible

[Mart Raudsepp]

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

Ühel kenal päeval, L, 01.08.2020 kell 14:32, kirjutas Adam Feldman:
> +       gnome2_src_configure ${mateconf[@]} "$@"

This might be something we may want to consider adding to gnome2.eclass
instead?
But I guess that's something to consider for any EAPI-7 port instead,
should one eventually happen (instead of everything moving to meson
instead).
So no objections adding it to mate.eclass for the time being.
gnome2.eclass would need too much checking that it's fine to bother at
this point without the EAPI bump. But remind about it, should a EAPI-7
gnome2 ever go up for review here :)


Mart

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 981 bytes --]

Re: [gentoo-dev] [PATCH] mate.eclass: drop static-libs whenever possible

[Adam Feldman]

[-- Attachment #1.1: Type: text/plain, Size: 938 bytes --]

On 8/2/20 3:56 AM, Mart Raudsepp wrote:
> Ühel kenal päeval, L, 01.08.2020 kell 14:32, kirjutas Adam Feldman:
>> +       gnome2_src_configure ${mateconf[@]} "$@"
> 
> This might be something we may want to consider adding to gnome2.eclass
> instead?
> But I guess that's something to consider for any EAPI-7 port instead,
> should one eventually happen (instead of everything moving to meson
> instead).
> So no objections adding it to mate.eclass for the time being.
> gnome2.eclass would need too much checking that it's fine to bother at
> this point without the EAPI bump. But remind about it, should a EAPI-7
> gnome2 ever go up for review here :)
> 
> 
> Mart
> 

Would you like a patch for gnome2.eclass now with a:
if has ${EAPI:-0} 7; then

fi
block so you'll be set to go upon updating the eclass to EAPI 7?

-- 
Thanks,

Adam Feldman
Gentoo Developer
NP-Hardass@gentoo.org
0x671C52F118F89C67


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]