Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/
Date: Sun, 03 Nov 2019 11:46:39
Message-Id: 1572781584.24b529d9e4c496e6cb55e36b403168ff7e512409.mgorny@gentoo
1 commit: 24b529d9e4c496e6cb55e36b403168ff7e512409
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 1 18:04:23 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 3 11:46:24 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b529d9
7
8 sys-libs/libomp: Port to llvm.org eclass
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libomp/libomp-10.0.0.9999.ebuild | 12 +++---------
13 sys-libs/libomp/libomp-9.0.0.ebuild | 7 +++----
14 sys-libs/libomp/libomp-9.0.1.9999.ebuild | 13 +++----------
15 3 files changed, 9 insertions(+), 23 deletions(-)
16
17 diff --git a/sys-libs/libomp/libomp-10.0.0.9999.ebuild b/sys-libs/libomp/libomp-10.0.0.9999.ebuild
18 index 100db97281e..5f49236cbe1 100644
19 --- a/sys-libs/libomp/libomp-10.0.0.9999.ebuild
20 +++ b/sys-libs/libomp/libomp-10.0.0.9999.ebuild
21 @@ -4,13 +4,12 @@
22 EAPI=7
23
24 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
25 -inherit cmake-multilib git-r3 linux-info multiprocessing python-any-r1
26 +inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
27
28 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
29 HOMEPAGE="https://openmp.llvm.org"
30 -SRC_URI=""
31 -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git"
32 -S=${WORKDIR}/${P}/openmp
33 +LLVM_COMPONENTS=( openmp )
34 +llvm.org_set_globals
35
36 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
37 SLOT="0"
38 @@ -67,11 +66,6 @@ pkg_setup() {
39 use test && python-any-r1_pkg_setup
40 }
41
42 -src_unpack() {
43 - git-r3_fetch
44 - git-r3_checkout '' '' '' openmp
45 -}
46 -
47 multilib_src_configure() {
48 local libdir="$(get_libdir)"
49 local mycmakeargs=(
50
51 diff --git a/sys-libs/libomp/libomp-9.0.0.ebuild b/sys-libs/libomp/libomp-9.0.0.ebuild
52 index 33b72bc0d34..50704d49743 100644
53 --- a/sys-libs/libomp/libomp-9.0.0.ebuild
54 +++ b/sys-libs/libomp/libomp-9.0.0.ebuild
55 @@ -4,13 +4,12 @@
56 EAPI=7
57
58 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
59 -inherit cmake-multilib linux-info multiprocessing python-any-r1
60 +inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
61
62 -MY_P=openmp-${PV}.src
63 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
64 HOMEPAGE="https://openmp.llvm.org"
65 -SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz"
66 -S=${WORKDIR}/${MY_P}
67 +LLVM_COMPONENTS=( openmp )
68 +llvm.org_set_globals
69
70 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
71 SLOT="0"
72
73 diff --git a/sys-libs/libomp/libomp-9.0.1.9999.ebuild b/sys-libs/libomp/libomp-9.0.1.9999.ebuild
74 index 2ca7ce34bf0..5f49236cbe1 100644
75 --- a/sys-libs/libomp/libomp-9.0.1.9999.ebuild
76 +++ b/sys-libs/libomp/libomp-9.0.1.9999.ebuild
77 @@ -4,14 +4,12 @@
78 EAPI=7
79
80 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
81 -inherit cmake-multilib git-r3 linux-info multiprocessing python-any-r1
82 +inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
83
84 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
85 HOMEPAGE="https://openmp.llvm.org"
86 -SRC_URI=""
87 -EGIT_REPO_URI="https://github.com/llvm/llvm-project.git"
88 -EGIT_BRANCH="release/9.x"
89 -S=${WORKDIR}/${P}/openmp
90 +LLVM_COMPONENTS=( openmp )
91 +llvm.org_set_globals
92
93 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
94 SLOT="0"
95 @@ -68,11 +66,6 @@ pkg_setup() {
96 use test && python-any-r1_pkg_setup
97 }
98
99 -src_unpack() {
100 - git-r3_fetch
101 - git-r3_checkout '' '' '' openmp
102 -}
103 -
104 multilib_src_configure() {
105 local libdir="$(get_libdir)"
106 local mycmakeargs=(