diff options
| author |   Christophe Lermytte <gentoo@lermytte.be> | 2021-10-08 13:12:40 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2021-10-20 04:11:09 +0000 |
| commit | 1c70c859516a9b67cc46c2f075eff296592d00ef (patch) | |
| tree | a0265e884da3bddbab7e5cef4c2ca5eba6ff0394 /dev-lang/ispc | |
| parent | media-sound/xwax: Stabilize 1.8 ppc64, #813981 (diff) | |
| download | gentoo-1c70c859516a9b67cc46c2f075eff296592d00ef.tar.gz gentoo-1c70c859516a9b67cc46c2f075eff296592d00ef.tar.bz2 gentoo-1c70c859516a9b67cc46c2f075eff296592d00ef.zip | |
dev-lang/ispc: bump to 1.16.1 and fix llvm dependency
Closes: https://bugs.gentoo.org/816069
Signed-off-by: Christophe Lermytte <gentoo@lermytte.be>
Closes: https://github.com/gentoo/gentoo/pull/22516
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-lang/ispc')
| -rw-r--r-- | dev-lang/ispc/Manifest | 1 | ||||
| -rw-r--r-- | dev-lang/ispc/ispc-1.16.1.ebuild | 78 | ||||
| -rw-r--r-- | dev-lang/ispc/ispc-9999.ebuild | 23 |
3 files changed, 90 insertions, 12 deletions
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest index e70729967c1e..59e44b09137a 100644 --- a/dev-lang/ispc/Manifest +++ b/dev-lang/ispc/Manifest @@ -1 +1,2 @@ DIST ispc-1.16.0.tar.gz 19548153 BLAKE2B 9b6d9329430d59041a76c20332b527560afa47a5585652abdf93aedb7907483d1647c829f2bd3f396cd53301bc79367cd91606b90a543fa8bec2f6ab34452989 SHA512 8469db4e3e9834477345b431162543f1c8e680aa9834c9a50239781dc7febfdde0561c2f13d1387e37f95a18c4376a85cb9cbae33cb614dc8977dfc9f47da215 +DIST ispc-1.16.1.tar.gz 19549428 BLAKE2B 742d94208d39f0560c3f2199ee06fc12f3ec2cf47c1039212219c6aa106b20cd58219e5d439c4fd1ce4a0c1a423655d0c2113a2a78152c99b4d77452171acce6 SHA512 89b844a15a888ae7074c4baa47f46d1d7176501f215c9a8c3b4bf9ad1960dc77d53f1f448d5253ad0c6a91e5088af243c3dfd148e619f9abeb6a16f715e3b463 diff --git a/dev-lang/ispc/ispc-1.16.1.ebuild b/dev-lang/ispc/ispc-1.16.1.ebuild new file mode 100644 index 000000000000..d71abadb585a --- /dev/null +++ b/dev-lang/ispc/ispc-1.16.1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +LLVM_MAX_SLOT=12 +inherit cmake python-any-r1 llvm + +DESCRIPTION="Intel SPMD Program Compiler" +HOMEPAGE="https://ispc.github.io/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ispc/ispc.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi + +LICENSE="BSD BSD-2 UoI-NCSA" +SLOT="0" +IUSE="examples" + +RDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/bison + sys-devel/flex + ${PYTHON_DEPS} +" + +PATCHES=( + "${FILESDIR}/${PN}-9999-llvm.patch" +) + +CMAKE_BUILD_TYPE="RelWithDebInfo" + +pkg_setup() { + llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + if use amd64; then + # On amd64 systems, build system enables x86/i686 build too. + # This ebuild doesn't even have multilib support, nor need it. + # https://bugs.gentoo.org/730062 + ewarn "Removing auto-x86 build on amd64" + sed -i -e 's:set(target_arch "i686"):return():' cmake/GenerateBuiltins.cmake || die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DARM_ENABLED=$(usex arm) + -DCMAKE_SKIP_RPATH=ON + -DISPC_NO_DUMPS=ON + ) + cmake_src_configure +} + +src_test() { + # Inject path to prevent using system ispc + PATH="${BUILD_DIR}/bin:${PATH}" ${EPYTHON} ./run_tests.py || die "Testing failed under ${EPYTHON}" +} + +src_install() { + dobin "${BUILD_DIR}"/bin/ispc + einstalldocs + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples + fi +} diff --git a/dev-lang/ispc/ispc-9999.ebuild b/dev-lang/ispc/ispc-9999.ebuild index b0a22ba1f907..d71abadb585a 100644 --- a/dev-lang/ispc/ispc-9999.ebuild +++ b/dev-lang/ispc/ispc-9999.ebuild @@ -3,11 +3,9 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8,9,10} ) - -inherit cmake llvm python-any-r1 - +PYTHON_COMPAT=( python3_{8..10} ) LLVM_MAX_SLOT=12 +inherit cmake python-any-r1 llvm DESCRIPTION="Intel SPMD Program Compiler" HOMEPAGE="https://ispc.github.io/" @@ -17,20 +15,20 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ispc/ispc.git" else SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi LICENSE="BSD BSD-2 UoI-NCSA" SLOT="0" IUSE="examples" -RDEPEND="<sys-devel/clang-13:=" -DEPEND=" - ${RDEPEND} - ${PYTHON_DEPS}" +RDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=" +DEPEND="${RDEPEND}" BDEPEND=" sys-devel/bison - sys-devel/flex" + sys-devel/flex + ${PYTHON_DEPS} +" PATCHES=( "${FILESDIR}/${PN}-9999-llvm.patch" @@ -38,8 +36,9 @@ PATCHES=( CMAKE_BUILD_TYPE="RelWithDebInfo" -llvm_check_deps() { - has_version -d "sys-devel/clang:${LLVM_SLOT}" +pkg_setup() { + llvm_pkg_setup + python-any-r1_pkg_setup } src_prepare() { |