[gentoo-dev] Re: [PATCH] eclass/cmake-utils.eclass: restrict rpath hack to Prefix/rpath

2019-07-31 Thread Michael Haubenwallner
On 7/15/19 2:45 PM, Michael Palimaka wrote:
> On 7/12/19 3:14 AM, hero...@gentoo.org wrote:
>> From: Benda Xu 
>>
>>    Prefix/standalone does not need it.
>> ---
>>   eclass/cmake-utils.eclass | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
>> index ea1858e9735f..109b584afb39 100644
>> --- a/eclass/cmake-utils.eclass
>> +++ b/eclass/cmake-utils.eclass
>> @@ -612,7 +612,7 @@ cmake-utils_src_configure() {
>>   fi
>>   fi
>>   -    if [[ ${EPREFIX} ]]; then
>> +    if use prefix-guest; then
>>   cat >> "${build_rules}" <<- _EOF_ || die
>>   # in Prefix we need rpath and must ensure cmake gets our 
>> default linker path
>>   # right ... except for Darwin hosts
>>
> 
> This seems to break non-prefix builds, as the prefix-guest USE flag will not 
> exist.
> 

Note that IUSE_IMPLICIT="prefix prefix-guest prefix-stack" is set in the base 
profile
of Gentoo mainline.  So the flag really should "exist" in non-prefix builds as 
well.

/haubi/



[gentoo-dev] Re: [PATCH] eclass/cmake-utils.eclass: restrict rpath hack to Prefix/rpath

2019-07-15 Thread Michael Palimaka

On 7/12/19 3:14 AM, hero...@gentoo.org wrote:

From: Benda Xu 

   Prefix/standalone does not need it.
---
  eclass/cmake-utils.eclass | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index ea1858e9735f..109b584afb39 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -612,7 +612,7 @@ cmake-utils_src_configure() {
fi
fi
  
-	if [[ ${EPREFIX} ]]; then

+   if use prefix-guest; then
cat >> "${build_rules}" <<- _EOF_ || die
# in Prefix we need rpath and must ensure cmake gets 
our default linker path
# right ... except for Darwin hosts



This seems to break non-prefix builds, as the prefix-guest USE flag will 
not exist.