From ffd72dc9d6dedfb0d977b1007aa8ddd77bfc9a291e0036be84a9dfd63128af81 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 14 Oct 2019 21:02:05 +0000 Subject: [PATCH 1/2] - Drop unused static libraries, functions of libOGLCompilerDLL and libOSDependent are actually present in libglslang already. [boo#1153950] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=58 --- glslang.changes | 7 +++++++ glslang.spec | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/glslang.changes b/glslang.changes index 0999a11..c96f2b0 100644 --- a/glslang.changes +++ b/glslang.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 14 21:01:23 UTC 2019 - Jan Engelhardt + +- Drop unused static libraries, functions of libOGLCompilerDLL and + libOSDependent are actually present in libglslang already. + [boo#1153950] + ------------------------------------------------------------------- Sat Sep 7 15:57:52 UTC 2019 - Jan Engelhardt diff --git a/glslang.spec b/glslang.spec index 2b3f840..56e0633 100644 --- a/glslang.spec +++ b/glslang.spec @@ -82,6 +82,7 @@ make %{?_smp_mflags} %global _lto_cflags %{_lto_cflags} -ffat-lto-objects %cmake_install b="%buildroot" +find "$b" -type f -name "*.a" -print -delete mkdir -p "$b/%_includedir" cp -a SPIRV glslang "$b/%_includedir/" find "$b/%_includedir/" -type f ! -iname "*.h" -a ! -iname "*.hpp" -print -delete @@ -89,6 +90,11 @@ ln -s SPIRV/spirv.hpp "$b/%_includedir/" find "$b/%_includedir/" -type f -exec chmod a-x "{}" "+" cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/" +# 3rd party programs use -lOGLCompiler (because pristine glslang ships .a files), +# so satisfy them under our shared build. +ln -s libglslang.so "$b/%_libdir/libOGLCompilerDLL.so" +ln -s libglslang.so "$b/%_libdir/libOSDependent.so" + %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -100,9 +106,10 @@ cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/" %defattr(-,root,root) %_bindir/gls* %_bindir/spirv* -%_libdir/*.a %_libdir/*resource*.so %_libdir/libHLSL.so +%_libdir/libOGLCompilerDLL.so +%_libdir/libOSDependent.so %_libdir/libSPIRV.so %_libdir/libSPVRemapper.so %_libdir/libglslang.so From 77ff6917de391153b7b08210fbc709d6b02f0f6849b29b0462431ab88573725e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 14 Oct 2019 21:09:42 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/glslang?expand=0&rev=59 --- glslang.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glslang.spec b/glslang.spec index 56e0633..e27dbca 100644 --- a/glslang.spec +++ b/glslang.spec @@ -92,7 +92,7 @@ cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/" # 3rd party programs use -lOGLCompiler (because pristine glslang ships .a files), # so satisfy them under our shared build. -ln -s libglslang.so "$b/%_libdir/libOGLCompilerDLL.so" +ln -s libglslang.so "$b/%_libdir/libOGLCompiler.so" ln -s libglslang.so "$b/%_libdir/libOSDependent.so" %post -n %lname -p /sbin/ldconfig @@ -108,7 +108,7 @@ ln -s libglslang.so "$b/%_libdir/libOSDependent.so" %_bindir/spirv* %_libdir/*resource*.so %_libdir/libHLSL.so -%_libdir/libOGLCompilerDLL.so +%_libdir/libOGLCompiler.so %_libdir/libOSDependent.so %_libdir/libSPIRV.so %_libdir/libSPVRemapper.so