1*4882a593SmuzhiyunFrom abf3a1b9c9cdacb574c2b9cdbf3f2a5e18c39ab9 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Rodrigo Rebello <rprebello@gmail.com> 3*4882a593SmuzhiyunDate: Mon, 29 Feb 2016 22:53:49 -0300 4*4882a593SmuzhiyunSubject: [PATCH 1/1] Add 'Libs.private' field to pkg-config file 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunIn order to support static linking, SDL_mixer.pc should include a 7*4882a593Smuzhiyun'Libs.private' field listing all the libraries that SDL_mixer requires. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunThis patch adds such a field and also modifies configure.ac so that 10*4882a593SmuzhiyunEXTRA_LDFLAGS (which is now also used as the value of 'Libs.private') 11*4882a593Smuzhiyunno longer includes SDL_LIBS. This is done so as to prevent libraries 12*4882a593Smuzhiyunrequired by SDL from being listed twice when 'pkg-config --libs --static 13*4882a593SmuzhiyunSDL_mixer' is run (they're already shown because of the 'Requires: sdl' 14*4882a593Smuzhiyunline in SDL_mixer.pc). Makefile.in is also adjusted accordingly. 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunUpstream status: submitted 17*4882a593Smuzhiyunhttps://bugzilla.libsdl.org/show_bug.cgi?id=3278 18*4882a593Smuzhiyun 19*4882a593SmuzhiyunSigned-off-by: Rodrigo Rebello <rprebello@gmail.com> 20*4882a593Smuzhiyun--- 21*4882a593Smuzhiyun Makefile.in | 2 +- 22*4882a593Smuzhiyun SDL_mixer.pc.in | 1 + 23*4882a593Smuzhiyun configure.ac | 1 - 24*4882a593Smuzhiyun 3 files changed, 2 insertions(+), 2 deletions(-) 25*4882a593Smuzhiyun 26*4882a593Smuzhiyundiff --git a/Makefile.in b/Makefile.in 27*4882a593Smuzhiyunindex 027a99b..18015a2 100644 28*4882a593Smuzhiyun--- a/Makefile.in 29*4882a593Smuzhiyun+++ b/Makefile.in 30*4882a593Smuzhiyun@@ -61,7 +61,7 @@ $(objects): 31*4882a593Smuzhiyun .PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) 34*4882a593Smuzhiyun- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) 35*4882a593Smuzhiyun+ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(SDL_LIBS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) 38*4882a593Smuzhiyun $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET) 39*4882a593Smuzhiyundiff --git a/SDL_mixer.pc.in b/SDL_mixer.pc.in 40*4882a593Smuzhiyunindex 1c4965d..d793521 100644 41*4882a593Smuzhiyun--- a/SDL_mixer.pc.in 42*4882a593Smuzhiyun+++ b/SDL_mixer.pc.in 43*4882a593Smuzhiyun@@ -8,5 +8,6 @@ Description: mixer library for Simple DirectMedia Layer 44*4882a593Smuzhiyun Version: @VERSION@ 45*4882a593Smuzhiyun Requires: sdl >= @SDL_VERSION@ 46*4882a593Smuzhiyun Libs: -L${libdir} -lSDL_mixer 47*4882a593Smuzhiyun+Libs.private: @EXTRA_LDFLAGS@ 48*4882a593Smuzhiyun Cflags: -I${includedir}/SDL 49*4882a593Smuzhiyun 50*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 51*4882a593Smuzhiyunindex 01a3d83..3ad3b4f 100644 52*4882a593Smuzhiyun--- a/configure.ac 53*4882a593Smuzhiyun+++ b/configure.ac 54*4882a593Smuzhiyun@@ -200,7 +200,6 @@ AM_PATH_SDL($SDL_VERSION, 55*4882a593Smuzhiyun AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) 56*4882a593Smuzhiyun ) 57*4882a593Smuzhiyun EXTRA_CFLAGS="$EXTRA_CFLAGS $SDL_CFLAGS" 58*4882a593Smuzhiyun-EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SDL_LIBS" 59*4882a593Smuzhiyun 60*4882a593Smuzhiyun dnl Check for math library 61*4882a593Smuzhiyun AC_CHECK_LIB(m, pow, [LIBM="-lm"]) 62*4882a593Smuzhiyun-- 63*4882a593Smuzhiyun2.27.0 64