Merge pull request #16409 from Rmys/master

glslang rebuild

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)

x11/vulkan/glslang/pspec.xml

@@ -66,7 +66,7 @@
     </Package>
 
     <History>
-        <Update release="18">
+        <Update release="19">
             <Date>2025-04-14</Date>
             <Version>15.2.0</Version>
             <Comment>Version bump.</Comment>