Thanks, applied as 0af33a4d2ec7467d12fc2355549d0b79d95263c8. Michael
[sent from post-receive hook] On Thu, 07 Oct 2021 12:18:48 +0200, Philipp Zabel <p.za...@pengutronix.de> wrote: > Signed-off-by: Philipp Zabel <p.za...@pengutronix.de> > Message-Id: <20210908113236.15651-5-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git a/rules/glslang.make b/rules/glslang.make > index 76ee41ba4357..3c1908bff8c3 100644 > --- a/rules/glslang.make > +++ b/rules/glslang.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang > # > # Paths and names > # > -GLSLANG_VERSION := 11.5.0 > -GLSLANG_MD5 := 6c86e1a5d65815a707af3bead744804c > +GLSLANG_VERSION := 11.6.0 > +GLSLANG_MD5 := 37918eefd58acd7309faf96fb83ab4ce > GLSLANG := glslang-$(GLSLANG_VERSION) > GLSLANG_SUFFIX := tar.gz > GLSLANG_URL := > https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) > @@ -32,18 +32,19 @@ GLSLANG_CONF_TOOL := cmake > GLSLANG_CONF_OPT := \ > $(CROSS_CMAKE_USR) \ > -DCMAKE_BUILD_TYPE=Release \ > - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ > - -DBUILD_SHARED_LIBS=ON \ > -DBUILD_EXTERNAL=OFF \ > - -DSKIP_GLSLANG_INSTALL=OFF \ > - -DENABLE_SPVREMAPPER=ON \ > + -DBUILD_SHARED_LIBS=ON \ > + -DENABLE_CTEST=OFF \ > + -DENABLE_EXCEPTIONS=OFF \ > -DENABLE_GLSLANG_BINARIES=ON \ > -DENABLE_GLSLANG_JS=OFF \ > -DENABLE_HLSL=OFF \ > - -DENABLE_RTTI=OFF \ > -DENABLE_OPT=ON \ > -DENABLE_PCH=ON \ > - -DENABLE_CTEST=OFF > + -DENABLE_RTTI=OFF \ > + -DENABLE_SPVREMAPPER=ON \ > + -DSKIP_GLSLANG_INSTALL=OFF \ > + -DUSE_CCACHE=OFF > > # > ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/host-glslang.make b/rules/host-glslang.make > index 2aaf3909a4e8..1718562d110b 100644 > --- a/rules/host-glslang.make > +++ b/rules/host-glslang.make > @@ -19,17 +19,19 @@ HOST_GLSLANG_CONF_TOOL := cmake > HOST_GLSLANG_CONF_OPT := \ > $(HOST_CMAKE_OPT) \ > -DCMAKE_BUILD_TYPE=Release \ > - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ > - -DBUILD_SHARED_LIBS=OFF \ > -DBUILD_EXTERNAL=OFF \ > - -DSKIP_GLSLANG_INSTALL=OFF \ > - -DENABLE_SPVREMAPPER=ON \ > + -DBUILD_SHARED_LIBS=OFF \ > + -DENABLE_CTEST=OFF \ > + -DENABLE_EXCEPTIONS=OFF \ > + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ > -DENABLE_GLSLANG_BINARIES=ON \ > -DENABLE_GLSLANG_JS=OFF \ > -DENABLE_HLSL=OFF \ > - -DENABLE_RTTI=OFF \ > -DENABLE_OPT=ON \ > -DENABLE_PCH=ON \ > - -DENABLE_CTEST=OFF > + -DENABLE_RTTI=OFF \ > + -DENABLE_SPVREMAPPER=ON \ > + -DSKIP_GLSLANG_INSTALL=OFF \ > + -DUSE_CCACHE=OFF > > # vim: syntax=make _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
