package/ltris: fix static linking with libmad
authorBernd Kuhls <bernd.kuhls@t-online.de>
Thu, 19 May 2016 05:52:13 +0000 (07:52 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Wed, 25 May 2016 21:20:27 +0000 (23:20 +0200)
Fixes
http://autobuild.buildroot.net/results/b06/b0671af6be81550221f5abf98c2c797787590199/

[Peter: add host-pkgconf to _DEPENDENCIES]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/ltris/ltris.mk

index e77f2ac931492a8dec0e965d3cabe131b7e2b634..530e11e06b89c840e4bc790aedf68cb31e30de01 100644 (file)
@@ -12,18 +12,22 @@ LTRIS_LICENSE_FILES = COPYING
 LTRIS_DEPENDENCIES = sdl
 
 LTRIS_CONF_ENV = \
-       SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config"
+       SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \
+       LIBS="$(LTRIS_LIBS)"
 
 ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y)
-LTRIS_DEPENDENCIES += sdl_mixer
+LTRIS_DEPENDENCIES += sdl_mixer host-pkgconf
 LTRIS_CONF_OPTS += --enable-audio=yes
+# configure script does NOT use pkg-config to figure out how to link
+# with sdl_mixer, breaking static linking as sdl_mixer can use libmad
+LTRIS_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs SDL_mixer`
 else
 LTRIS_CONF_OPTS += --disable-audio
 endif
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
 LTRIS_DEPENDENCIES += gettext
-LTRIS_CONF_ENV += LIBS=-lintl
+LTRIS_LIBS += -lintl
 endif
 
 $(eval $(autotools-package))