Thanks, applied as 8193a24ad7a7a2ed0e3b0f1d9ca88e9e9d0547b7. Michael
[sent from post-receive hook] On Mon, 17 Aug 2020 08:18:17 +0200, Philipp Zabel <[email protected]> wrote: > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Reviewed-by: Roland Hieber <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/glslang.in b/rules/glslang.in > index c2a660243d31..fba48e79e857 100644 > --- a/rules/glslang.in > +++ b/rules/glslang.in > @@ -4,6 +4,7 @@ menuconfig GLSLANG > tristate > prompt "glslang" > select HOST_CMAKE > + select HOST_SYSTEM_PYTHON3 > help > Khronos-reference SPIR-V generator > > diff --git a/rules/glslang.make b/rules/glslang.make > index ada329737ce1..904517d1a8ce 100644 > --- a/rules/glslang.make > +++ b/rules/glslang.make > @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang > # > # Paths and names > # > -GLSLANG_VERSION := 2020-05-27-ge00d27c6d65b > -GLSLANG_MD5 := 88f06a4835895a46fa073035084b0f48 > +GLSLANG_VERSION := 2020-07-23-g3ee5f2f1d331 > +GLSLANG_MD5 := 63686ec05a51d7c8c80fff79277924a7 > GLSLANG := glslang-$(GLSLANG_VERSION) > GLSLANG_SUFFIX := tar.gz > GLSLANG_URL := > https://github.com/KhronosGroup/glslang/archive/$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) > GLSLANG_SOURCE := $(SRCDIR)/$(GLSLANG).$(GLSLANG_SUFFIX) > GLSLANG_DIR := $(BUILDDIR)/$(GLSLANG) > -GLSLANG_LICENSE := BSD-3-clause AND MIT AND Apple-MIT-License > -GLSLANG_LICENSE_FILES := > file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b > +GLSLANG_LICENSE := BSD-3-clause AND BSD-2-clause AND MIT AND > Apple-MIT-License AND Apache-2.0 AND (GPL-3.0-or-later WITH > Bison-exception-2.2) > +GLSLANG_LICENSE_FILES := > file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229 > > # > ---------------------------------------------------------------------------- > # Prepare > diff --git a/rules/host-glslang.in b/rules/host-glslang.in > index 69f255572c2b..8ef31f52937a 100644 > --- a/rules/host-glslang.in > +++ b/rules/host-glslang.in > @@ -4,3 +4,4 @@ config HOST_GLSLANG > tristate > default y if ALLYES > select HOST_CMAKE > + select HOST_SYSTEM_PYTHON3 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
