Thanks, applied as 733d4f610ba73704ad505997800cc0106e5815d4. Michael
[sent from post-receive hook] On Mon, 28 Feb 2022 13:09:41 +0100, Philipp Zabel <[email protected]> wrote: > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
