Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> --- rules/glslang.in | 1 + rules/glslang.make | 8 ++++---- rules/host-glslang.make | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/rules/glslang.in b/rules/glslang.in index 367ae0cf7d65..5280397b8ffb 100644 --- a/rules/glslang.in +++ b/rules/glslang.in @@ -5,6 +5,7 @@ menuconfig GLSLANG prompt "glslang " select HOST_CMAKE select HOST_SYSTEM_PYTHON3 + select SPIRV_TOOLS help Khronos-reference SPIR-V generator diff --git a/rules/glslang.make b/rules/glslang.make index b6abb65d307e..784e1666c7cd 100644 --- a/rules/glslang.make +++ b/rules/glslang.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang # # Paths and names # -GLSLANG_VERSION := 1.3.268.0 -GLSLANG_MD5 := 3e32bb2d667ed3330d05ac513de31bb5 +GLSLANG_VERSION := 1.3.275.0 +GLSLANG_MD5 := 017c759481a055f5eee91c74adc7d4cd GLSLANG := glslang-$(GLSLANG_VERSION) GLSLANG_SUFFIX := tar.gz GLSLANG_URL := https://github.com/KhronosGroup/glslang/archive/vulkan-sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) @@ -35,7 +35,7 @@ GLSLANG_CONF_OPT := \ -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \ -DBUILD_EXTERNAL=OFF \ -DBUILD_SHARED_LIBS=ON \ - -DENABLE_CTEST=OFF \ + -DBUILD_WERROR=OFF \ -DENABLE_EXCEPTIONS=OFF \ -DENABLE_GLSLANG_BINARIES=ON \ -DENABLE_GLSLANG_JS=OFF \ @@ -44,7 +44,7 @@ GLSLANG_CONF_OPT := \ -DENABLE_PCH=ON \ -DENABLE_RTTI=OFF \ -DENABLE_SPVREMAPPER=ON \ - -DSKIP_GLSLANG_INSTALL=OFF + -DGLSLANG_TESTS=OFF # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/host-glslang.make b/rules/host-glslang.make index 923ad216a53d..1a63f76ce5e4 100644 --- a/rules/host-glslang.make +++ b/rules/host-glslang.make @@ -22,7 +22,7 @@ HOST_GLSLANG_CONF_OPT := \ -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \ -DBUILD_EXTERNAL=OFF \ -DBUILD_SHARED_LIBS=OFF \ - -DENABLE_CTEST=OFF \ + -DBUILD_WERROR=OFF \ -DENABLE_EXCEPTIONS=OFF \ -DENABLE_GLSLANG_BINARIES=ON \ -DENABLE_GLSLANG_JS=OFF \ @@ -31,6 +31,6 @@ HOST_GLSLANG_CONF_OPT := \ -DENABLE_PCH=ON \ -DENABLE_RTTI=OFF \ -DENABLE_SPVREMAPPER=ON \ - -DSKIP_GLSLANG_INSTALL=OFF + -DGLSLANG_TESTS=OFF # vim: syntax=make -- 2.39.2