| 1 |
commit: 297d996757be1cf6381bfb06279a896bd9d8ec7d |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 19 23:01:42 2021 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 19 23:21:03 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=297d9967 |
| 7 |
|
| 8 |
dev-lang/ispc: minor style fixes, drop cmake gentoo patch |
| 9 |
|
| 10 |
Patch does not make sense anymore given this ebuild is setting |
| 11 |
another CMAKE_BUILD_TYPE. |
| 12 |
|
| 13 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-lang/ispc/ispc-1.16.0.ebuild | 36 ++++++++++++++++-------------------- |
| 16 |
dev-lang/ispc/ispc-9999.ebuild | 36 ++++++++++++++++-------------------- |
| 17 |
2 files changed, 32 insertions(+), 40 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-lang/ispc/ispc-1.16.0.ebuild b/dev-lang/ispc/ispc-1.16.0.ebuild |
| 20 |
index 8c7854a7766..b0a22ba1f90 100644 |
| 21 |
--- a/dev-lang/ispc/ispc-1.16.0.ebuild |
| 22 |
+++ b/dev-lang/ispc/ispc-1.16.0.ebuild |
| 23 |
@@ -5,14 +5,14 @@ EAPI=7 |
| 24 |
|
| 25 |
PYTHON_COMPAT=( python3_{8,9,10} ) |
| 26 |
|
| 27 |
-inherit cmake python-any-r1 llvm |
| 28 |
+inherit cmake llvm python-any-r1 |
| 29 |
|
| 30 |
LLVM_MAX_SLOT=12 |
| 31 |
|
| 32 |
DESCRIPTION="Intel SPMD Program Compiler" |
| 33 |
HOMEPAGE="https://ispc.github.io/" |
| 34 |
|
| 35 |
-if [[ ${PV} = *9999 ]]; then |
| 36 |
+if [[ ${PV} == 9999 ]]; then |
| 37 |
inherit git-r3 |
| 38 |
EGIT_REPO_URI="https://github.com/ispc/ispc.git" |
| 39 |
else |
| 40 |
@@ -27,15 +27,12 @@ IUSE="examples" |
| 41 |
RDEPEND="<sys-devel/clang-13:=" |
| 42 |
DEPEND=" |
| 43 |
${RDEPEND} |
| 44 |
- ${PYTHON_DEPS} |
| 45 |
- " |
| 46 |
+ ${PYTHON_DEPS}" |
| 47 |
BDEPEND=" |
| 48 |
sys-devel/bison |
| 49 |
- sys-devel/flex |
| 50 |
- " |
| 51 |
+ sys-devel/flex" |
| 52 |
|
| 53 |
PATCHES=( |
| 54 |
- "${FILESDIR}/${PN}-1.13.0-cmake-gentoo-release.patch" |
| 55 |
"${FILESDIR}/${PN}-9999-llvm.patch" |
| 56 |
) |
| 57 |
|
| 58 |
@@ -50,7 +47,7 @@ src_prepare() { |
| 59 |
# On amd64 systems, build system enables x86/i686 build too. |
| 60 |
# This ebuild doesn't even have multilib support, nor need it. |
| 61 |
# https://bugs.gentoo.org/730062 |
| 62 |
- elog "Removing auto-x86 build on amd64" |
| 63 |
+ ewarn "Removing auto-x86 build on amd64" |
| 64 |
sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die |
| 65 |
fi |
| 66 |
|
| 67 |
@@ -59,25 +56,24 @@ src_prepare() { |
| 68 |
|
| 69 |
src_configure() { |
| 70 |
local mycmakeargs=( |
| 71 |
- "-DARM_ENABLED=$(usex arm)" |
| 72 |
- "-DCMAKE_SKIP_RPATH=ON" |
| 73 |
- "-DISPC_NO_DUMPS=ON" |
| 74 |
+ -DARM_ENABLED=$(usex arm) |
| 75 |
+ -DCMAKE_SKIP_RPATH=ON |
| 76 |
+ -DISPC_NO_DUMPS=ON |
| 77 |
) |
| 78 |
cmake_src_configure |
| 79 |
} |
| 80 |
|
| 81 |
+src_test() { |
| 82 |
+ # Inject path to prevent using system ispc |
| 83 |
+ PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} ./run_tests.py || die "Testing failed under ${EPYTHON}" |
| 84 |
+} |
| 85 |
+ |
| 86 |
src_install() { |
| 87 |
dobin "${BUILD_DIR}"/bin/ispc |
| 88 |
- dodoc README.md |
| 89 |
+ einstalldocs |
| 90 |
|
| 91 |
if use examples; then |
| 92 |
- insinto "/usr/share/doc/${PF}/examples" |
| 93 |
- docompress -x "/usr/share/doc/${PF}/examples" |
| 94 |
- doins -r "${S}"/examples/* |
| 95 |
+ docompress -x /usr/share/doc/${PF}/examples |
| 96 |
+ dodoc -r examples |
| 97 |
fi |
| 98 |
} |
| 99 |
- |
| 100 |
-src_test() { |
| 101 |
- # Inject path to prevent using system ispc |
| 102 |
- PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} ./run_tests.py || die "Testing failed under ${EPYTHON}" |
| 103 |
-} |
| 104 |
|
| 105 |
diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild |
| 106 |
index 8c7854a7766..b0a22ba1f90 100644 |
| 107 |
--- a/dev-lang/ispc/ispc-9999.ebuild |
| 108 |
+++ b/dev-lang/ispc/ispc-9999.ebuild |
| 109 |
@@ -5,14 +5,14 @@ EAPI=7 |
| 110 |
|
| 111 |
PYTHON_COMPAT=( python3_{8,9,10} ) |
| 112 |
|
| 113 |
-inherit cmake python-any-r1 llvm |
| 114 |
+inherit cmake llvm python-any-r1 |
| 115 |
|
| 116 |
LLVM_MAX_SLOT=12 |
| 117 |
|
| 118 |
DESCRIPTION="Intel SPMD Program Compiler" |
| 119 |
HOMEPAGE="https://ispc.github.io/" |
| 120 |
|
| 121 |
-if [[ ${PV} = *9999 ]]; then |
| 122 |
+if [[ ${PV} == 9999 ]]; then |
| 123 |
inherit git-r3 |
| 124 |
EGIT_REPO_URI="https://github.com/ispc/ispc.git" |
| 125 |
else |
| 126 |
@@ -27,15 +27,12 @@ IUSE="examples" |
| 127 |
RDEPEND="<sys-devel/clang-13:=" |
| 128 |
DEPEND=" |
| 129 |
${RDEPEND} |
| 130 |
- ${PYTHON_DEPS} |
| 131 |
- " |
| 132 |
+ ${PYTHON_DEPS}" |
| 133 |
BDEPEND=" |
| 134 |
sys-devel/bison |
| 135 |
- sys-devel/flex |
| 136 |
- " |
| 137 |
+ sys-devel/flex" |
| 138 |
|
| 139 |
PATCHES=( |
| 140 |
- "${FILESDIR}/${PN}-1.13.0-cmake-gentoo-release.patch" |
| 141 |
"${FILESDIR}/${PN}-9999-llvm.patch" |
| 142 |
) |
| 143 |
|
| 144 |
@@ -50,7 +47,7 @@ src_prepare() { |
| 145 |
# On amd64 systems, build system enables x86/i686 build too. |
| 146 |
# This ebuild doesn't even have multilib support, nor need it. |
| 147 |
# https://bugs.gentoo.org/730062 |
| 148 |
- elog "Removing auto-x86 build on amd64" |
| 149 |
+ ewarn "Removing auto-x86 build on amd64" |
| 150 |
sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die |
| 151 |
fi |
| 152 |
|
| 153 |
@@ -59,25 +56,24 @@ src_prepare() { |
| 154 |
|
| 155 |
src_configure() { |
| 156 |
local mycmakeargs=( |
| 157 |
- "-DARM_ENABLED=$(usex arm)" |
| 158 |
- "-DCMAKE_SKIP_RPATH=ON" |
| 159 |
- "-DISPC_NO_DUMPS=ON" |
| 160 |
+ -DARM_ENABLED=$(usex arm) |
| 161 |
+ -DCMAKE_SKIP_RPATH=ON |
| 162 |
+ -DISPC_NO_DUMPS=ON |
| 163 |
) |
| 164 |
cmake_src_configure |
| 165 |
} |
| 166 |
|
| 167 |
+src_test() { |
| 168 |
+ # Inject path to prevent using system ispc |
| 169 |
+ PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} ./run_tests.py || die "Testing failed under ${EPYTHON}" |
| 170 |
+} |
| 171 |
+ |
| 172 |
src_install() { |
| 173 |
dobin "${BUILD_DIR}"/bin/ispc |
| 174 |
- dodoc README.md |
| 175 |
+ einstalldocs |
| 176 |
|
| 177 |
if use examples; then |
| 178 |
- insinto "/usr/share/doc/${PF}/examples" |
| 179 |
- docompress -x "/usr/share/doc/${PF}/examples" |
| 180 |
- doins -r "${S}"/examples/* |
| 181 |
+ docompress -x /usr/share/doc/${PF}/examples |
| 182 |
+ dodoc -r examples |
| 183 |
fi |
| 184 |
} |
| 185 |
- |
| 186 |
-src_test() { |
| 187 |
- # Inject path to prevent using system ispc |
| 188 |
- PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} ./run_tests.py || die "Testing failed under ${EPYTHON}" |
| 189 |
-} |
Archives