From 81284dece192a56d0e73bddc6aa0bdfd5fde9ae1 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 10 Jan 2024 15:49:18 +0000 Subject: dev-util/intel_clc: add missing libunwind dep Closes: https://bugs.gentoo.org/921709 Bug: https://bugs.gentoo.org/920055 Signed-off-by: Sam James --- dev-util/intel_clc/intel_clc-23.3.1-r1.ebuild | 118 ++++++++++++++++++++++++++ dev-util/intel_clc/intel_clc-23.3.1.ebuild | 115 ------------------------- dev-util/intel_clc/intel_clc-23.3.2-r1.ebuild | 118 ++++++++++++++++++++++++++ dev-util/intel_clc/intel_clc-23.3.2.ebuild | 115 ------------------------- dev-util/intel_clc/intel_clc-9999.ebuild | 7 +- 5 files changed, 241 insertions(+), 232 deletions(-) create mode 100644 dev-util/intel_clc/intel_clc-23.3.1-r1.ebuild delete mode 100644 dev-util/intel_clc/intel_clc-23.3.1.ebuild create mode 100644 dev-util/intel_clc/intel_clc-23.3.2-r1.ebuild delete mode 100644 dev-util/intel_clc/intel_clc-23.3.2.ebuild (limited to 'dev-util/intel_clc') diff --git a/dev-util/intel_clc/intel_clc-23.3.1-r1.ebuild b/dev-util/intel_clc/intel_clc-23.3.1-r1.ebuild new file mode 100644 index 000000000000..f11eb6455214 --- /dev/null +++ b/dev-util/intel_clc/intel_clc-23.3.1-r1.ebuild @@ -0,0 +1,118 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit llvm meson python-any-r1 + +MY_PV="${PV/_/-}" + +DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V" +HOMEPAGE="https://mesa3d.org/" + +if [[ ${PV} == 9999 ]]; then + S="${WORKDIR}/intel_clc-${MY_PV}" + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + inherit git-r3 +else + S="${WORKDIR}/mesa-${MY_PV}" + SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz" + KEYWORDS="~amd64" +fi + +LICENSE="MIT SGI-B-2.0" +SLOT="0" +IUSE="debug unwind" + +RDEPEND=" + dev-libs/libclc + dev-util/spirv-tools + >=sys-libs/zlib-1.2.8:= + x11-libs/libdrm + unwind? ( sys-libs/libunwind:= ) +" +DEPEND="${RDEPEND} + dev-libs/expat +" +BDEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + virtual/pkgconfig +" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling one than more slot +# simultaneously. +# +# How to use it: +# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17. +# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15. +LLVM_MAX_SLOT="17" +LLVM_MIN_SLOT="15" +PER_SLOT_DEPSTR=" + ( + dev-util/spirv-llvm-translator:@SLOT@ + sys-devel/clang:@SLOT@ + sys-devel/llvm:@SLOT@ + ) +" +LLVM_DEPSTR=" + || ( + $(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do + echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}" + done) + ) + =dev-python/mako-0.8.0[${PYTHON_USEDEP}]" +} + +pkg_setup() { + llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_configure() { + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" + + local emesonargs=( + -Dllvm=enabled + -Dshared-llvm=enabled + -Dintel-clc=enabled + + -Dgallium-drivers='' + -Dvulkan-drivers='' + + # Set platforms empty to avoid the default "auto" setting. If + # platforms is empty meson.build will add surfaceless. + -Dplatforms='' + + -Dglx=disabled + -Dzstd=disabled + + $(meson_feature unwind libunwind) + + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +src_install() { + dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc +} diff --git a/dev-util/intel_clc/intel_clc-23.3.1.ebuild b/dev-util/intel_clc/intel_clc-23.3.1.ebuild deleted file mode 100644 index e1a7520244d4..000000000000 --- a/dev-util/intel_clc/intel_clc-23.3.1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit llvm meson python-any-r1 - -MY_PV="${PV/_/-}" - -DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V" -HOMEPAGE="https://mesa3d.org/" - -if [[ ${PV} == 9999 ]]; then - S="${WORKDIR}/intel_clc-${MY_PV}" - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" - inherit git-r3 -else - S="${WORKDIR}/mesa-${MY_PV}" - SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz" - KEYWORDS="~amd64" -fi - -LICENSE="MIT SGI-B-2.0" -SLOT="0" -IUSE="debug" - -RDEPEND=" - dev-libs/libclc - dev-util/spirv-tools - >=sys-libs/zlib-1.2.8:= - x11-libs/libdrm -" -DEPEND="${RDEPEND} - dev-libs/expat -" -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") - virtual/pkgconfig -" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. -# -# How to use it: -# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17. -# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15. -LLVM_MAX_SLOT="17" -LLVM_MIN_SLOT="15" -PER_SLOT_DEPSTR=" - ( - dev-util/spirv-llvm-translator:@SLOT@ - sys-devel/clang:@SLOT@ - sys-devel/llvm:@SLOT@ - ) -" -LLVM_DEPSTR=" - || ( - $(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do - echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}" - done) - ) - =dev-python/mako-0.8.0[${PYTHON_USEDEP}]" -} - -pkg_setup() { - llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_configure() { - PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" - - local emesonargs=( - -Dllvm=enabled - -Dshared-llvm=enabled - -Dintel-clc=enabled - - -Dgallium-drivers='' - -Dvulkan-drivers='' - - # Set platforms empty to avoid the default "auto" setting. If - # platforms is empty meson.build will add surfaceless. - -Dplatforms='' - - -Dglx=disabled - -Dzstd=disabled - - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc -} diff --git a/dev-util/intel_clc/intel_clc-23.3.2-r1.ebuild b/dev-util/intel_clc/intel_clc-23.3.2-r1.ebuild new file mode 100644 index 000000000000..46bcd7e65951 --- /dev/null +++ b/dev-util/intel_clc/intel_clc-23.3.2-r1.ebuild @@ -0,0 +1,118 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit llvm meson python-any-r1 + +MY_PV="${PV/_/-}" + +DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V" +HOMEPAGE="https://mesa3d.org/" + +if [[ ${PV} == 9999 ]]; then + S="${WORKDIR}/intel_clc-${MY_PV}" + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + inherit git-r3 +else + S="${WORKDIR}/mesa-${MY_PV}" + SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz" + KEYWORDS="~amd64" +fi + +LICENSE="MIT SGI-B-2.0" +SLOT="0" +IUSE="debug unwind" + +RDEPEND=" + dev-libs/libclc + dev-util/spirv-tools + >=sys-libs/zlib-1.2.8:= + x11-libs/libdrm + unwind? ( sys-libs/libunwind:= ) +" +DEPEND="${RDEPEND} + dev-libs/expat +" +BDEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + virtual/pkgconfig +" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling one than more slot +# simultaneously. +# +# How to use it: +# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17. +# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15. +LLVM_MAX_SLOT="17" +LLVM_MIN_SLOT="15" +PER_SLOT_DEPSTR=" + ( + dev-util/spirv-llvm-translator:@SLOT@ + sys-devel/clang:@SLOT@ + sys-devel/llvm:@SLOT@ + ) +" +LLVM_DEPSTR=" + || ( + $(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do + echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}" + done) + ) + =dev-python/mako-0.8.0[${PYTHON_USEDEP}]" +} + +pkg_setup() { + llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_configure() { + PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" + + local emesonargs=( + -Dllvm=enabled + -Dshared-llvm=enabled + -Dintel-clc=enabled + + -Dgallium-drivers='' + -Dvulkan-drivers='' + + # Set platforms empty to avoid the default "auto" setting. If + # platforms is empty meson.build will add surfaceless. + -Dplatforms='' + + -Dglx=disabled + -Dzstd=disabled + + $(meson_feature unwind libunwind) + + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +src_install() { + dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc +} diff --git a/dev-util/intel_clc/intel_clc-23.3.2.ebuild b/dev-util/intel_clc/intel_clc-23.3.2.ebuild deleted file mode 100644 index b96f57ecbd96..000000000000 --- a/dev-util/intel_clc/intel_clc-23.3.2.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit llvm meson python-any-r1 - -MY_PV="${PV/_/-}" - -DESCRIPTION="intel_clc tool used for building OpenCL C to SPIR-V" -HOMEPAGE="https://mesa3d.org/" - -if [[ ${PV} == 9999 ]]; then - S="${WORKDIR}/intel_clc-${MY_PV}" - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" - inherit git-r3 -else - S="${WORKDIR}/mesa-${MY_PV}" - SRC_URI="https://archive.mesa3d.org/mesa-${MY_PV}.tar.xz" - KEYWORDS="~amd64" -fi - -LICENSE="MIT SGI-B-2.0" -SLOT="0" -IUSE="debug" - -RDEPEND=" - dev-libs/libclc - dev-util/spirv-tools - >=sys-libs/zlib-1.2.8:= - x11-libs/libdrm -" -DEPEND="${RDEPEND} - dev-libs/expat -" -BDEPEND=" - ${PYTHON_DEPS} - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") - virtual/pkgconfig -" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. -# -# How to use it: -# 1. Specify LLVM_MAX_SLOT (inclusive), e.g. 17. -# 2. Specify LLVM_MIN_SLOT (inclusive), e.g. 15. -LLVM_MAX_SLOT="17" -LLVM_MIN_SLOT="15" -PER_SLOT_DEPSTR=" - ( - dev-util/spirv-llvm-translator:@SLOT@ - sys-devel/clang:@SLOT@ - sys-devel/llvm:@SLOT@ - ) -" -LLVM_DEPSTR=" - || ( - $(for ((slot=LLVM_MAX_SLOT; slot>=LLVM_MIN_SLOT; slot--)); do - echo "${PER_SLOT_DEPSTR//@SLOT@/${slot}}" - done) - ) - =dev-python/mako-0.8.0[${PYTHON_USEDEP}]" -} - -pkg_setup() { - llvm_pkg_setup - python-any-r1_pkg_setup -} - -src_configure() { - PKG_CONFIG_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/$(get_libdir)/pkgconfig" - - local emesonargs=( - -Dllvm=enabled - -Dshared-llvm=enabled - -Dintel-clc=enabled - - -Dgallium-drivers='' - -Dvulkan-drivers='' - - # Set platforms empty to avoid the default "auto" setting. If - # platforms is empty meson.build will add surfaceless. - -Dplatforms='' - - -Dglx=disabled - -Dzstd=disabled - - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -src_install() { - dobin "${BUILD_DIR}"/src/intel/compiler/intel_clc -} diff --git a/dev-util/intel_clc/intel_clc-9999.ebuild b/dev-util/intel_clc/intel_clc-9999.ebuild index b96f57ecbd96..46bcd7e65951 100644 --- a/dev-util/intel_clc/intel_clc-9999.ebuild +++ b/dev-util/intel_clc/intel_clc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,13 +24,14 @@ fi LICENSE="MIT SGI-B-2.0" SLOT="0" -IUSE="debug" +IUSE="debug unwind" RDEPEND=" dev-libs/libclc dev-util/spirv-tools >=sys-libs/zlib-1.2.8:= x11-libs/libdrm + unwind? ( sys-libs/libunwind:= ) " DEPEND="${RDEPEND} dev-libs/expat @@ -104,6 +105,8 @@ src_configure() { -Dglx=disabled -Dzstd=disabled + $(meson_feature unwind libunwind) + --buildtype $(usex debug debug plain) -Db_ndebug=$(usex debug false true) ) -- cgit v1.2.3-65-gdbad