From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 23 Feb 2022 11:18:01 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nMoif-007Xej-JN for lore@lore.pengutronix.de; Wed, 23 Feb 2022 11:18:01 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nMoie-0007BD-CP; Wed, 23 Feb 2022 11:18:00 +0100 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nMoi3-0006vx-Bj for ptxdist@pengutronix.de; Wed, 23 Feb 2022 11:17:23 +0100 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Wed, 23 Feb 2022 11:17:06 +0100 Message-Id: <20220223101710.3873749-2-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220223101710.3873749-1-p.zabel@pengutronix.de> References: <20220223101710.3873749-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH 2/6] shaderc: version bump v2021.3 -> v2022.1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Signed-off-by: Philipp Zabel --- 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