Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: Thu, 03 Feb 2022 08:27:58
Message-Id: 1643876869.ae66ecc10ba5290e0a30df1a34029f3c47589dd9.mgorny@gentoo
1 commit: ae66ecc10ba5290e0a30df1a34029f3c47589dd9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 3 07:59:07 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 3 08:27:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae66ecc1
7
8 sys-libs/libomp: Pass offload-specific flags w/ USE=offload only
9
10 Closes: https://bugs.gentoo.org/832596
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 sys-libs/libomp/libomp-13.0.1.9999.ebuild | 38 +++++++++++++++++--------------
14 sys-libs/libomp/libomp-13.0.1.ebuild | 38 +++++++++++++++++--------------
15 sys-libs/libomp/libomp-14.0.0.9999.ebuild | 38 +++++++++++++++++--------------
16 3 files changed, 63 insertions(+), 51 deletions(-)
17
18 diff --git a/sys-libs/libomp/libomp-13.0.1.9999.ebuild b/sys-libs/libomp/libomp-13.0.1.9999.ebuild
19 index 81e776270450..dbee89f1997c 100644
20 --- a/sys-libs/libomp/libomp-13.0.1.9999.ebuild
21 +++ b/sys-libs/libomp/libomp-13.0.1.9999.ebuild
22 @@ -92,24 +92,28 @@ multilib_src_configure() {
23 # disable unnecessary hack copying stuff back to srcdir
24 -DLIBOMP_COPY_EXPORTS=OFF
25 )
26 - if use offload && has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
27 - mycmakeargs+=(
28 - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
29 - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
30 - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
31 - # a cheap hack to force clang
32 - -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
33 - # upstream defaults to looking for it in clang dir
34 - # this fails when ccache is being used
35 - -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
36 - )
37 - else
38 - mycmakeargs+=(
39 - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
40 - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
41 - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF
42 - )
43 +
44 + if use offload; then
45 + if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
46 + mycmakeargs+=(
47 + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
48 + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
49 + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
50 + # a cheap hack to force clang
51 + -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
52 + # upstream defaults to looking for it in clang dir
53 + # this fails when ccache is being used
54 + -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
55 + )
56 + else
57 + mycmakeargs+=(
58 + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
59 + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
60 + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF
61 + )
62 + fi
63 fi
64 +
65 use test && mycmakeargs+=(
66 # this project does not use standard LLVM cmake macros
67 -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
68
69 diff --git a/sys-libs/libomp/libomp-13.0.1.ebuild b/sys-libs/libomp/libomp-13.0.1.ebuild
70 index dd1eef719c90..06eeabf9fc22 100644
71 --- a/sys-libs/libomp/libomp-13.0.1.ebuild
72 +++ b/sys-libs/libomp/libomp-13.0.1.ebuild
73 @@ -93,24 +93,28 @@ multilib_src_configure() {
74 # disable unnecessary hack copying stuff back to srcdir
75 -DLIBOMP_COPY_EXPORTS=OFF
76 )
77 - if use offload && has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
78 - mycmakeargs+=(
79 - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
80 - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
81 - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
82 - # a cheap hack to force clang
83 - -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
84 - # upstream defaults to looking for it in clang dir
85 - # this fails when ccache is being used
86 - -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
87 - )
88 - else
89 - mycmakeargs+=(
90 - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
91 - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
92 - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF
93 - )
94 +
95 + if use offload; then
96 + if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
97 + mycmakeargs+=(
98 + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
99 + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
100 + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
101 + # a cheap hack to force clang
102 + -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
103 + # upstream defaults to looking for it in clang dir
104 + # this fails when ccache is being used
105 + -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
106 + )
107 + else
108 + mycmakeargs+=(
109 + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
110 + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
111 + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF
112 + )
113 + fi
114 fi
115 +
116 use test && mycmakeargs+=(
117 # this project does not use standard LLVM cmake macros
118 -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
119
120 diff --git a/sys-libs/libomp/libomp-14.0.0.9999.ebuild b/sys-libs/libomp/libomp-14.0.0.9999.ebuild
121 index 81e776270450..dbee89f1997c 100644
122 --- a/sys-libs/libomp/libomp-14.0.0.9999.ebuild
123 +++ b/sys-libs/libomp/libomp-14.0.0.9999.ebuild
124 @@ -92,24 +92,28 @@ multilib_src_configure() {
125 # disable unnecessary hack copying stuff back to srcdir
126 -DLIBOMP_COPY_EXPORTS=OFF
127 )
128 - if use offload && has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
129 - mycmakeargs+=(
130 - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
131 - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
132 - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
133 - # a cheap hack to force clang
134 - -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
135 - # upstream defaults to looking for it in clang dir
136 - # this fails when ccache is being used
137 - -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
138 - )
139 - else
140 - mycmakeargs+=(
141 - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
142 - -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
143 - -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF
144 - )
145 +
146 + if use offload; then
147 + if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
148 + mycmakeargs+=(
149 + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
150 + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
151 + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
152 + # a cheap hack to force clang
153 + -DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
154 + # upstream defaults to looking for it in clang dir
155 + # this fails when ccache is being used
156 + -DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
157 + )
158 + else
159 + mycmakeargs+=(
160 + -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
161 + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
162 + -DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF
163 + )
164 + fi
165 fi
166 +
167 use test && mycmakeargs+=(
168 # this project does not use standard LLVM cmake macros
169 -DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
Report Message
Find on MARC Find on Google Groups