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..e27dbca 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/libOGLCompiler.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/libOGLCompiler.so +%_libdir/libOSDependent.so %_libdir/libSPIRV.so %_libdir/libSPVRemapper.so %_libdir/libglslang.so