gentoo resync : 04.05.2019

5 files changed, 168 insertions, 0 deletions

diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
new file mode 100644
index 000000000000..bfd04f155eb2
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -0,0 +1,6 @@
+AUX spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch 533 BLAKE2B 4d0d1b4c605681b2dbfc4c52730c9f20f8290f11a2be9c37db78e533a996c22140faafc2691c732b49b9de28a59644bd5e39a2b7d4209eb44486cdeee1338de8 SHA512 db4786a10e4380f4575d52cf861a82d0aa9f69cec7d47d574f453d159396e993527ba4e469fab75fabc36b977ee4b61abb9e3787ee2af45af8f5865b3b06e10c
+DIST spirv-llvm-translator-8.0.0.1-LowerOpenCL_new_block_representation.patch.xz 10108 BLAKE2B 96492a7d3ab25e1fe837ced225d50c7450595af52bc3aa6c17e02dc08c1cccaf7ca8dc5949da17da7cc6ea5fcae8688a5994a50bb7693a52493520e57981bc48 SHA512 574ca7b7fe054e82ee154556555e2d184f102faa7da08ce9d6ca5d2ca37463c7a86b3861b93969f9c886544551af8c8f95e57363ea017f7fc426b56d97eb7cf2
+DIST spirv-llvm-translator-8.0.0.1.tar.gz 437384 BLAKE2B bca52bfec04d0adc08b00f5fdbcb6cf953be00f835d2a393545e77bd8776063ef91e8fb62c232b50cbeab58a0a01bea6e47b89c1756699bf35481e87823995de SHA512 85faf176d1ce79d19f10c88055f4a102a5952dcdcd6709e5e5cfdbf69eb958d51020a3ad34198c7c874b42ee8e318f1ce3169ea92853134dfff3dc5843f84414
+EBUILD spirv-llvm-translator-8.0.0.1-r1.ebuild 1650 BLAKE2B 84b0fc6c6846382d5d172f59128f7d80d058537d4cf9f9fa4105756cf3f94e034d18a48a7f156a0976b80ae4f57e371c4aadc0975397f39efc79a5ebf39cd9ad SHA512 3a4f9e284d4007d8bae05b81ee220cd963e4e26e74fc5489d9d4de77d43409e81a18948b084f71ff2eae87d1418bbed20bddaccaf37a4972b8ac074fa97193a1
+EBUILD spirv-llvm-translator-8.0.0.1.ebuild 1474 BLAKE2B 4c0f80f4ad6ca1d465fbbbe46062f9f29cd5348deadd472e5346f56329dc3a420d98d534c2490a3632ecd199798fc79753b54aaa4a4a7c44b23a33cb93158dc4 SHA512 00070420d028527cd178430ddcda231643cbf4683fbc4c547640e2651f2bcea12f44fa4fa99aadd039b889a73011fb1e293ee3d84eb0226291e6e03e42f1aae8
+MISC metadata.xml 345 BLAKE2B d7d62cd25a192044ab04f58277f56278cd20d1fe77df030c18bdc3d39c96cfc9d2cd3c1ba4ad4b870dcbb1b9f3822f6eeb661212b77523cf25a3189b4581d86e SHA512 57484e916f6f9b003275398d7d244fc85276a744b6b720df010d23ba4e03898011f6364f817f4f8ce0c92d91a5d367819c142f4b3f000ca9c4802c017a419256
diff --git a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch
new file mode 100644
index 000000000000..66e81dc3b20d
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch
@@ -0,0 +1,18 @@
+Do not install pkgconfig data files, pkg-config does not presently look at
+/usr/lib/llvm/.../pkgconfig and putting them in /usr/lib*/pkgconfig would
+cause collisions between slots.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,11 +66,3 @@
+   DESTINATION
+     ${CMAKE_INSTALL_PREFIX}/include/LLVMSPIRVLib
+ )
+-
+-configure_file(LLVMSPIRVLib.pc.in ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc @ONLY)
+-install(
+-  FILES
+-    ${CMAKE_BINARY_DIR}/LLVMSPIRVLib.pc
+-  DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/pkgconfig
+-)
diff --git a/dev-util/spirv-llvm-translator/metadata.xml b/dev-util/spirv-llvm-translator/metadata.xml
new file mode 100644
index 000000000000..d7dec83e2de9
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">KhronosGroup/SPIRV-LLVM-Translator</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-r1.ebuild
new file mode 100644
index 000000000000..3412d8cf4a0c
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib flag-o-matic llvm eapi7-ver
+
+MY_PN="SPIRV-LLVM-Translator"
+MY_PV="$(ver_rs 3 -)"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~marecki/dists/${PN}/${PN}-8.0.0.1-LowerOpenCL_new_block_representation.patch.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="8"
+KEYWORDS="~amd64"
+IUSE="test"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}
+	test? ( dev-python/lit )"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=8
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-8.0.0.1-LowerOpenCL_new_block_representation.patch
+	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
+)
+
+src_prepare() {
+	append-flags -fPIC
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile llvm-spirv
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	# CMake does not install the executable so do it by hand
+	if multilib_is_native_abi; then
+		exeinto "$(get_llvm_prefix)"/bin
+		doexe "${BUILD_DIR}"/tools/llvm-spirv/llvm-spirv
+	fi
+}
+
+multilib_src_test() {
+	# TODO: figure out why some tests fail on amd64 when ABI==x86
+	if multilib_is_native_abi; then
+		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
+	fi
+}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild
new file mode 100644
index 000000000000..9e8e3b39fed5
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.0.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib flag-o-matic llvm eapi7-ver
+
+MY_PN="SPIRV-LLVM-Translator"
+MY_PV="$(ver_rs 3 -)"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="8"
+KEYWORDS="~amd64"
+IUSE="test"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}
+	test? ( dev-python/lit )"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=8
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
+)
+
+src_prepare() {
+	append-flags -fPIC
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix)"
+		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile llvm-spirv
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	# CMake does not install the executable so do it by hand
+	if multilib_is_native_abi; then
+		exeinto "$(get_llvm_prefix)"/bin
+		doexe "${BUILD_DIR}"/tools/llvm-spirv/llvm-spirv
+	fi
+}
+
+multilib_src_test() {
+	# TODO: figure out why some tests fail on amd64 when ABI==x86
+	if multilib_is_native_abi; then
+		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
+	fi
+}