From e6a7c21ef8bb2063ca3bbfccb37b4ff762c6b86910d8edb37a8082db276a8ce9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 16 Apr 2020 08:33:02 +0000 Subject: [PATCH] - Restore libSDL2main.a, patching it out was not easily possible. OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=103 --- SDL2.changes | 5 +++++ SDL2.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/SDL2.changes b/SDL2.changes index af6b2c5..827df72 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 16 08:32:06 UTC 2020 - Jan Engelhardt + +- Restore libSDL2main.a, patching it out was not easily possible. + ------------------------------------------------------------------- Wed Mar 11 10:23:44 UTC 2020 - Jan Engelhardt diff --git a/SDL2.spec b/SDL2.spec index a4a350e..34ebf34 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -137,9 +137,11 @@ make %{?_smp_mflags} V=1 %install %make_install rm -f "%buildroot/%_libdir"/*.la -# We do not want static libs, but using --disable-static leads to make aborting -# halfway through %%build. Now it can be removed though. -rm -f "%buildroot/%_libdir/"*.a +rm -fv "%buildroot/%_libdir/libSDL2.a" "%buildroot/%_libdir/libSDL2_test.a" +# Need to keep libSDL2main.a (empty lib), because it is referenced by +# sdl2-config.cmake, and it seems like that .cmake file cannot be edited to +# make SDL2::SDL2main a phony target with no file (just leads to more Makefile +# errors down the road). %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -157,5 +159,6 @@ rm -f "%buildroot/%_libdir/"*.a %_datadir/aclocal/sdl2.m4 %_libdir/pkgconfig/sdl2.pc %_libdir/cmake/SDL2/ +%_libdir/libSDL2main.a %changelog