From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 2/6] shaderc: version bump v2021.3 -> v2022.1
Date: Wed, 23 Feb 2022 11:17:06 +0100 [thread overview]
Message-ID: <20220223101710.3873749-2-p.zabel@pengutronix.de> (raw)
In-Reply-To: <20220223101710.3873749-1-p.zabel@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/host-shaderc.make | 41 ++++++++++++++++++++++++++++++++++++-
rules/shaderc.make | 45 ++++++++++++++++++++++++++++++++++++++---
2 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/rules/host-shaderc.make b/rules/host-shaderc.make
index 50b6a6503634..daacb30375f6 100644
--- a/rules/host-shaderc.make
+++ b/rules/host-shaderc.make
@@ -54,9 +54,48 @@ HOST_SHADERC_CONF_TOOL := cmake
HOST_SHADERC_CONF_OPT := \
$(HOST_CMAKE_OPT) \
-DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_EXTERNAL=ON \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DBUILD_TESTING=ON \
+ -DDISABLE_EXCEPTIONS=OFF \
+ -DDISABLE_RTTI=OFF \
+ -DENABLE_CODE_COVERAGE=OFF \
+ -DENABLE_CTEST=ON \
+ -DENABLE_EXCEPTIONS=OFF \
+ -DENABLE_EXCEPTIONS_ON_MSVC=ON \
+ -DENABLE_GLSLANG_BINARIES=ON \
+ -DENABLE_GLSLANG_JS=OFF \
+ -DENABLE_HLSL=ON \
+ -DENABLE_OPT=ON \
+ -DENABLE_PCH=ON \
+ -DENABLE_RTTI=OFF \
+ -DENABLE_SPVREMAPPER=ON \
+ -DSHADERC_ENABLE_WERROR_COMPILE=ON \
+ -DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
+ -DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
+ -DSHADERC_SKIP_EXAMPLES=OFF \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-DSHADERC_SKIP_INSTALL=OFF \
-DSHADERC_SKIP_TESTS=ON \
- -DSHADERC_ENABLE_WERROR_COMPILE=ON
+ -DSKIP_GLSLANG_INSTALL=OFF \
+ -DSKIP_SPIRV_TOOLS_INSTALL=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_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF \
+ -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
+ -DSPIRV_HEADERS_SKIP_INSTALL=ON \
+ -DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
+ -DSPIRV_LOG_DEBUG=OFF \
+ -DSPIRV_SKIP_EXECUTABLES=OFF \
+ -DSPIRV_SKIP_TESTS=ON \
+ -DSPIRV_TOOLS_BUILD_STATIC=ON \
+ -DSPIRV_TOOLS_INSTALL_EMACS_HELPERS=OFF \
+ -DSPIRV_WARN_EVERYTHING=OFF \
+ -DSPIRV_WERROR=ON \
+ -DUSE_CCACHE=OFF
# vim: syntax=make
diff --git a/rules/shaderc.make b/rules/shaderc.make
index 3970ebcf869d..71a2454a9c21 100644
--- a/rules/shaderc.make
+++ b/rules/shaderc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc
#
# Paths and names
#
-SHADERC_VERSION := v2021.3
-SHADERC_MD5 := d35d7dda364d73c65fc82f3f4f917cdd
+SHADERC_VERSION := v2022.1
+SHADERC_MD5 := dc104cea7c6dee347e326031bdb77593
SHADERC := shaderc-$(SHADERC_VERSION)
SHADERC_SUFFIX := tar.gz
SHADERC_URL := \
@@ -72,10 +72,49 @@ SHADERC_CONF_TOOL := cmake
SHADERC_CONF_OPT := \
$(CROSS_CMAKE_USR) \
-DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_EXTERNAL=ON \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DBUILD_TESTING=ON \
+ -DDISABLE_EXCEPTIONS=OFF \
+ -DDISABLE_RTTI=OFF \
+ -DENABLE_CODE_COVERAGE=OFF \
+ -DENABLE_CTEST=ON \
+ -DENABLE_EXCEPTIONS=OFF \
+ -DENABLE_EXCEPTIONS_ON_MSVC=ON \
+ -DENABLE_GLSLANG_BINARIES=ON \
+ -DENABLE_GLSLANG_JS=OFF \
+ -DENABLE_HLSL=ON \
+ -DENABLE_OPT=ON \
+ -DENABLE_PCH=ON \
+ -DENABLE_RTTI=OFF \
+ -DENABLE_SPVREMAPPER=ON \
+ -DSHADERC_ENABLE_WERROR_COMPILE=ON \
+ -DSHADERC_ENABLE_WGSL_OUTPUT=OFF \
+ -DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
+ -DSHADERC_SKIP_EXAMPLES=OFF \
-DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \
-DSHADERC_SKIP_INSTALL=OFF \
-DSHADERC_SKIP_TESTS=ON \
- -DSHADERC_ENABLE_WERROR_COMPILE=ON
+ -DSKIP_GLSLANG_INSTALL=OFF \
+ -DSKIP_SPIRV_TOOLS_INSTALL=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_CROSS_EXCEPTIONS_TO_ASSERTIONS=OFF \
+ -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \
+ -DSPIRV_HEADERS_SKIP_INSTALL=ON \
+ -DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
+ -DSPIRV_LOG_DEBUG=OFF \
+ -DSPIRV_SKIP_EXECUTABLES=OFF \
+ -DSPIRV_SKIP_TESTS=ON \
+ -DSPIRV_TOOLS_BUILD_STATIC=ON \
+ -DSPIRV_TOOLS_INSTALL_EMACS_HELPERS=OFF \
+ -DSPIRV_WARN_EVERYTHING=OFF \
+ -DSPIRV_WERROR=ON \
+ -DUSE_CCACHE=OFF
# ----------------------------------------------------------------------------
# Target-Install
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2022-02-23 10:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-23 10:17 [ptxdist] [PATCH 1/6] glslang: version bump 11.7.1 -> 1.3.204.0 Philipp Zabel
2022-02-23 10:17 ` Philipp Zabel [this message]
2022-02-28 12:09 ` [ptxdist] [APPLIED] shaderc: version bump v2021.3 -> v2022.1 Michael Olbrich
2022-02-23 10:17 ` [ptxdist] [PATCH 3/6] spirv-tools: version bump 2021.4 -> 1.3.204.0, separate spirv-headers Philipp Zabel
2022-02-24 15:56 ` Roland Hieber
2022-02-24 16:14 ` Philipp Zabel
2022-02-25 8:27 ` Michael Olbrich
2022-02-23 10:17 ` [ptxdist] [PATCH 4/6] vulkan-loader: version bump 1.2.198.1 -> 1.3.204.0 Philipp Zabel
2022-02-28 12:09 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-02-23 10:17 ` [ptxdist] [PATCH 5/6] vulkan-tools: version bump 1.2.198.0 " Philipp Zabel
2022-02-28 12:09 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-02-23 10:17 ` [ptxdist] [PATCH 6/6] vulkan-validationlayers: " Philipp Zabel
2022-02-28 12:09 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-02-24 15:54 ` [ptxdist] [PATCH 1/6] glslang: version bump 11.7.1 " Roland Hieber
2022-02-24 16:07 ` Philipp Zabel
2022-02-25 8:42 ` Michael Olbrich
2022-02-25 8:24 ` Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220223101710.3873749-2-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox