Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 676372 - dev-utils/cmake: revision of Prefix patch
Summary: dev-utils/cmake: revision of Prefix patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-01-27 00:54 UTC by Benda Xu
Modified: 2019-02-03 09:59 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
cmake-prefix.patch (cmake-prefix.patch,4.43 KB, patch)
2019-01-27 00:55 UTC, Benda Xu
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Benda Xu gentoo-dev 2019-01-27 00:54:05 UTC
I intend to push a revision of the Prefix patch, which removes extra host paths from Platform/UnixPaths.cmake.  The extra paths are only needed in prefix-rpath.  They cause bugs to prefix-standalone and introduce duplications for gx86.

I refreshed the cmake-3.9.0_rc2-prefix-dirs.patch by quilt. Full free to adopt it with your git workflow.

If no objection is raised and no refreshing of the patch is needed, I will commit it in 1 week.

Cheers,
Benda

Reproducible: Always
Comment 1 Benda Xu gentoo-dev 2019-01-27 00:55:32 UTC
Created attachment 562934 [details, diff]
cmake-prefix.patch

The patch Benda intends to push in 1 week.
Comment 2 Fabian Groffen gentoo-dev 2019-01-27 08:23:29 UTC
So what's the plan for prefix-rpath if the paths are removed?
Comment 3 Benda Xu gentoo-dev 2019-01-27 09:22:13 UTC
(In reply to Fabian Groffen from comment #2)
> So what's the plan for prefix-rpath if the paths are removed?

According to "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")", on prefix-rpath, only the @GENTOO_HOST@ tag will be removed.  That's the old behavior.
Comment 4 Fabian Groffen gentoo-dev 2019-01-27 09:33:40 UTC
Ok, I'm not very good at reading patch on patch-es.  Should be fine then.
Comment 5 Andreas Sturmlechner gentoo-dev 2019-01-27 09:58:14 UTC
(In reply to Benda Xu from comment #0)
> If no objection is raised and no refreshing of the patch is needed, I will
> commit it in 1 week.

The proper way to do this is sending your patch to gentoo-dev mailing list.
Comment 6 Benda Xu gentoo-dev 2019-01-27 10:32:55 UTC
Hi Andreas,

(In reply to Andreas Sturmlechner from comment #5)
> (In reply to Benda Xu from comment #0)
> > If no objection is raised and no refreshing of the patch is needed, I will
> > commit it in 1 week.
> 
> The proper way to do this is sending your patch to gentoo-dev mailing list.

That is only needed for eclasses. Although depended on by many packages, cmake is not even in the @system.  Correct me if I am wrong, I don't this we should discuss it on the gentoo-dev.  Otherwise, the mailing list will be too busy with trivial patches of local changes.

Yours,
Benda
Comment 7 Larry the Git Cow gentoo-dev 2019-02-03 09:59:50 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa74d8382b940a619abbdcb1020b1f8599ca264b

commit aa74d8382b940a619abbdcb1020b1f8599ca264b
Author:     Benda Xu <heroxbd@gentoo.org>
AuthorDate: 2019-01-27 00:44:15 +0000
Commit:     Benda Xu <heroxbd@gentoo.org>
CommitDate: 2019-02-03 09:54:01 +0000

    dev-util/cmake: remove host directories in Platform/UnixPaths.cmake
    
      Although needed in prefix-rpath, the host directories cause bugs for
      prefix-standalone and introduce duplications for gx86.
    
      gx86 duplication example:
    
    ...
    list(APPEND CMAKE_SYSTEM_PREFIX_PATH
      # Standard
      /usr/local /usr /
      /usr/local /usr /
    ...
    
    Closes: https://bugs.gentoo.org/676372
    Package-Manager: Portage-2.3.52, Repoman-2.3.12
    Signed-off-by: Benda Xu <heroxbd@gentoo.org>

 dev-util/cmake/cmake-3.13.4.ebuild                 |   3 +-
 .../cmake/files/cmake-3.13.4-prefix-dirs.patch     | 127 +++++++++++++++++++++
 2 files changed, 129 insertions(+), 1 deletion(-)