commit: df0dd63d433b2d3325679014524b205434f698d7 Author: Nick Sarnie <commendsarnex <AT> gmail <DOT> com> AuthorDate: Sat Mar 24 01:55:47 2018 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Apr 14 19:50:21 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df0dd63d
dev-util/spirv-tools: Revbump and add a header that includes git SHA1 for vulkan-loader Closes: https://github.com/gentoo/gentoo/pull/7599 ...v-tools-9999.ebuild => spirv-tools-2018.2-r1.ebuild} | 17 ++++++++++++++--- dev-util/spirv-tools/spirv-tools-9999.ebuild | 9 +++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild similarity index 52% copy from dev-util/spirv-tools/spirv-tools-9999.ebuild copy to dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild index e6ecb91d83e..79312b8aeab 100644 --- a/dev-util/spirv-tools/spirv-tools-9999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild @@ -3,19 +3,23 @@ EAPI=6 -inherit cmake-multilib cmake-utils git-r3 +inherit cmake-multilib cmake-utils DESCRIPTION="Provides an API and commands for processing SPIR-V modules" HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"; -EGIT_REPO_URI="https://github.com/KhronosGroup/SPIRV-Tools.git"; -SRC_URI="" +SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" +KEYWORDS="~amd64" RDEPEND="" DEPEND="dev-util/spirv-headers" +S="${WORKDIR}/SPIRV-Tools-${PV}" + +UPSTREAM_COMMIT="8d8a71278bf9e83dd0fb30d5474386d30870b74d" + multilib_src_configure() { local mycmakeargs=( "-DSPIRV-Headers_SOURCE_DIR=/usr/" @@ -23,3 +27,10 @@ multilib_src_configure() { cmake-utils_src_configure } + +multilib_src_install() { + default + echo "${UPSTREAM_COMMIT}" > "${PN}-commit.h" || die + insinto /usr/include/"${PN}" + doins "${PN}-commit.h" || die +} diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild index e6ecb91d83e..e0e2f53d0e2 100644 --- a/dev-util/spirv-tools/spirv-tools-9999.ebuild +++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild @@ -23,3 +23,12 @@ multilib_src_configure() { cmake-utils_src_configure } + +multilib_src_install() { + default + + # create a header file with the commit hash of the current revision + # vulkan-tools needs this to build + local revision="$(git-r3_peek_remote_ref)" &> /dev/null + echo "${revision}" > "${D}/usr/include/${PN}/${PN}-commit.h" || die +}
