* [gentoo-dev] [PATCH] eclass/cmake-utils.eclass: restrict rpath hack to Prefix/rpath
@ 2019-07-11 17:14 heroxbd
2019-07-15 12:45 ` [gentoo-dev] " Michael Palimaka
0 siblings, 1 reply; 3+ messages in thread
From: heroxbd @ 2019-07-11 17:14 UTC (permalink / raw
To: gentoo-dev; +Cc: Benda Xu
From: Benda Xu <heroxbd@gentoo.org>
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
--
2.17.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-dev] Re: [PATCH] eclass/cmake-utils.eclass: restrict rpath hack to Prefix/rpath
2019-07-11 17:14 [gentoo-dev] [PATCH] eclass/cmake-utils.eclass: restrict rpath hack to Prefix/rpath heroxbd
@ 2019-07-15 12:45 ` Michael Palimaka
2019-07-31 7:47 ` Michael Haubenwallner
0 siblings, 1 reply; 3+ messages in thread
From: Michael Palimaka @ 2019-07-15 12:45 UTC (permalink / raw
To: gentoo-dev, heroxbd; +Cc: kde
On 7/12/19 3:14 AM, heroxbd@gentoo.org wrote:
> From: Benda Xu <heroxbd@gentoo.org>
>
> 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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-dev] Re: [PATCH] eclass/cmake-utils.eclass: restrict rpath hack to Prefix/rpath
2019-07-15 12:45 ` [gentoo-dev] " Michael Palimaka
@ 2019-07-31 7:47 ` Michael Haubenwallner
0 siblings, 0 replies; 3+ messages in thread
From: Michael Haubenwallner @ 2019-07-31 7:47 UTC (permalink / raw
To: gentoo-dev, Michael Palimaka, heroxbd; +Cc: kde
On 7/15/19 2:45 PM, Michael Palimaka wrote:
> On 7/12/19 3:14 AM, heroxbd@gentoo.org wrote:
>> From: Benda Xu <heroxbd@gentoo.org>
>>
>> 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/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-31 7:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-11 17:14 [gentoo-dev] [PATCH] eclass/cmake-utils.eclass: restrict rpath hack to Prefix/rpath heroxbd
2019-07-15 12:45 ` [gentoo-dev] " Michael Palimaka
2019-07-31 7:47 ` Michael Haubenwallner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox