summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2021-09-08 13:32:31 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-09-08 16:00:30 +0200
commitf2ca4b36a1a137f784ad29b638fa8ea3bf57d6b4 (patch)
tree2814cf8105e540ca7b5b0781794ed4aef96f0f08
parentee3ed73f6d796440964713556d756f6d6628f1a9 (diff)
downloadptxdist-f2ca4b36a1a137f784ad29b638fa8ea3bf57d6b4.tar.gz
ptxdist-f2ca4b36a1a137f784ad29b638fa8ea3bf57d6b4.tar.xz
spirv-tools: version bump 2021.2 -> 2021.3
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Message-Id: <20210908113236.15651-1-p.zabel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/spirv-tools.make27
1 files changed, 18 insertions, 9 deletions
diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make
index ad9f93179..3268067e0 100644
--- a/rules/spirv-tools.make
+++ b/rules/spirv-tools.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools
#
# Paths and names
#
-SPIRV_TOOLS_VERSION := 2021.2
-SPIRV_TOOLS_MD5 := 05973a3023181f7eee8228911d8abf29
+SPIRV_TOOLS_VERSION := 2021.3
+SPIRV_TOOLS_MD5 := 10a93f76597585574bdc2db85de9ce1e
SPIRV_TOOLS := spirv-tools-$(SPIRV_TOOLS_VERSION)
SPIRV_TOOLS_SUFFIX := tar.gz
SPIRV_TOOLS_URL := https://github.com/KhronosGroup/SPIRV-Tools/archive/v$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
@@ -24,8 +24,9 @@ SPIRV_TOOLS_DIR := $(BUILDDIR)/$(SPIRV_TOOLS)
SPIRV_TOOLS_LICENSE := Apache-2.0
SPIRV_TOOLS_LICENSE_FILES := file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57
-SPIRV_HEADERS_VERSION := 2021-06-16-g07f259e68af3
-SPIRV_HEADERS_MD5 := 4a2bf8e2d1fc8041c77046d5d64d6044
+
+SPIRV_HEADERS_VERSION := 2021-08-11-ge71feddb3f17
+SPIRV_HEADERS_MD5 := f23686511e7015477077dafc7bcb66a5
SPIRV_HEADERS_SUFFIX := tar.gz
SPIRV_HEADERS_URL := https://github.com/KhronosGroup/SPIRV-Headers/archive/$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
SPIRV_HEADERS_SOURCE := $(SRCDIR)/spirv-headers-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
@@ -54,15 +55,23 @@ SPIRV_TOOLS_CONF_TOOL := cmake
SPIRV_TOOLS_CONF_OPT := \
$(CROSS_CMAKE_USR) \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DSPIRV_ALLOW_TIMERS=ON \
+ -DENABLE_RTTI=OFF \
-DSKIP_SPIRV_TOOLS_INSTALL=OFF \
- -DSPIRV_WERROR=OFF \
- -DSPIRV_WARN_EVERYTHING=OFF \
+ -DSPIRV_ALLOW_TIMERS=ON \
+ -DSPIRV_BUILD_COMPRESSION=OFF \
+ -DSPIRV_BUILD_FUZZER=OFF \
+ -DSPIRV_BUILD_LIBFUZZER_TARGETS=OFF \
+ -DSPIRV_CHECK_CONTEXT=ON \
-DSPIRV_COLOR_TERMINAL=ON \
+ -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
+ -DSPIRV_HEADERS_SKIP_INSTALL=ON \
-DSPIRV_LOG_DEBUG=OFF \
-DSPIRV_SKIP_EXECUTABLES=ON \
- -DSPIRV_SKIP_TESTS=ON
+ -DSPIRV_SKIP_TESTS=ON \
+ -DSPIRV_TOOLS_BUILD_STATIC=ON \
+ -DSPIRV_TOOLS_INSTALL_EMACS_HELPERS=OFF \
+ -DSPIRV_WARN_EVERYTHING=OFF \
+ -DSPIRV_WERROR=OFF
# ----------------------------------------------------------------------------
# Install