Thanks, applied as 599269ff83f77560eb7a7cc5e556a0004caaa883. Michael
[sent from post-receive hook] On Fri, 10 Nov 2023 08:25:18 +0100, Philipp Zabel <p.za...@pengutronix.de> wrote: > Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> > Message-Id: <20231101115110.2870626-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git a/rules/host-shaderc.make b/rules/host-shaderc.make > index 0a30f7c22a07..c7a57c07f49d 100644 > --- a/rules/host-shaderc.make > +++ b/rules/host-shaderc.make > @@ -54,6 +54,7 @@ HOST_SHADERC_CONF_TOOL := cmake > HOST_SHADERC_CONF_OPT := \ > $(HOST_CMAKE_OPT) \ > -DCMAKE_BUILD_TYPE=Release \ > + -DALLOW_EXTERNAL_SPIRV_TOOLS=OFF \ > -DBUILD_EXTERNAL=ON \ > -DBUILD_SHARED_LIBS=OFF \ > -DBUILD_TESTING=ON \ > @@ -72,6 +73,8 @@ HOST_SHADERC_CONF_OPT := \ > -DSHADERC_ENABLE_WERROR_COMPILE=ON \ > -DSHADERC_ENABLE_WGSL_OUTPUT=OFF \ > -DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \ > + -DSHADERC_SKIP_EXAMPLES=ON \ > + -DSHADERC_SKIP_INSTALL=OFF \ > -DSHADERC_SKIP_TESTS=ON \ > -DSPIRV_ALLOW_TIMERS=ON \ > -DSPIRV_BUILD_COMPRESSION=OFF \ > @@ -80,8 +83,6 @@ HOST_SHADERC_CONF_OPT := \ > -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 \ > diff --git a/rules/shaderc.make b/rules/shaderc.make > index 5369696dd2bb..1e52d4182dcd 100644 > --- a/rules/shaderc.make > +++ b/rules/shaderc.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc > # > # Paths and names > # > -SHADERC_VERSION := v2023.6 > -SHADERC_MD5 := fd7536f8ad546a0b4d846e9d45de0715 > +SHADERC_VERSION := v2023.7 > +SHADERC_MD5 := c48f99976a603d3c968cd6811f67a24f > SHADERC := shaderc-$(SHADERC_VERSION) > SHADERC_SUFFIX := tar.gz > SHADERC_URL := \ > @@ -72,6 +72,7 @@ SHADERC_CONF_TOOL := cmake > SHADERC_CONF_OPT := \ > $(CROSS_CMAKE_USR) \ > -DCMAKE_BUILD_TYPE=Release \ > + -DALLOW_EXTERNAL_SPIRV_TOOLS=OFF \ > -DBUILD_EXTERNAL=ON \ > -DBUILD_SHARED_LIBS=OFF \ > -DBUILD_TESTING=ON \ > @@ -90,6 +91,8 @@ SHADERC_CONF_OPT := \ > -DSHADERC_ENABLE_WERROR_COMPILE=ON \ > -DSHADERC_ENABLE_WGSL_OUTPUT=OFF \ > -DSHADERC_SKIP_COPYRIGHT_CHECK=OFF \ > + -DSHADERC_SKIP_EXAMPLES=ON \ > + -DSHADERC_SKIP_INSTALL=OFF \ > -DSHADERC_SKIP_TESTS=ON \ > -DSPIRV_ALLOW_TIMERS=ON \ > -DSPIRV_BUILD_COMPRESSION=OFF \ > @@ -98,8 +101,6 @@ SHADERC_CONF_OPT := \ > -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 \
