From d23f2a4ededbe9fe624af7fec8f412a50346808e Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 17 Apr 2025 12:28:42 +0300 Subject: [PATCH] glslang rebuild --- x11/vulkan/glslang/actions.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/x11/vulkan/glslang/actions.py b/x11/vulkan/glslang/actions.py index c2a230c194..2c0fb2ad87 100755 --- a/x11/vulkan/glslang/actions.py +++ b/x11/vulkan/glslang/actions.py @@ -15,22 +15,32 @@ pisitools.cxxflags.add("-std=gnu++11") def setup(): if get.buildTYPE() == "emul32": - cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib32 \ - -DBUILD_SHARED_LIBS=ON \ - -DALLOW_EXTERNAL_SPIRV_TOOLS=ON") + cmaketools.configure("-Bbuild-shared -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_INSTALL_LIBDIR='lib32' \ + -DBUILD_SHARED_LIBS='ON' \ + -DCMAKE_INSTALL_BINDIR=bin32 \ + -DALLOW_EXTERNAL_SPIRV_TOOLS='ON'") # -DENABLE_GLSLANG_BINARIES=OFF else: - cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib \ - -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \ - -DBUILD_SHARED_LIBS=ON") + cmaketools.configure("-Bbuild-shared -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_INSTALL_LIBDIR='lib' \ + -DALLOW_EXTERNAL_SPIRV_TOOLS='ON' \ + -DBUILD_SHARED_LIBS='ON'") def build(): + shelltools.cd("build-shared") cmaketools.make() def install(): - autotools.rawInstall("DESTDIR=%s" %get.installDIR()) + shelltools.cd("build-shared") + autotools.rawInstall("DESTDIR=%s" %get.installDIR()) + + if get.buildTYPE() == "emul32": + pisitools.removeDir("/usr/bin32") + for f in shelltools.ls("%s/usr/lib32/cmake" % get.installDIR()): + pisitools.dosed("%s/usr/lib32/cmake/%s" % (get.installDIR(), f), "bin32", "bin") #for tool in ["glslangValidator", "spirv-remap"]: #pisitools.domove("/usr/bin32/%s" %tool, "/usr/bin", "%s-32" %tool)