diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2016-05-19 07:52:13 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-05-25 23:20:27 +0200 |
| commit | 14572af6932ada3850ee19c299d1c5124410d5b5 (patch) | |
| tree | ca77f722c5665c81ee51308fc840a99103601a3b | |
| parent | ae2355a07f2ade3e8afd83da8185e740f3015a70 (diff) | |
| download | buildroot-14572af6932ada3850ee19c299d1c5124410d5b5.tar.gz buildroot-14572af6932ada3850ee19c299d1c5124410d5b5.zip | |
package/ltris: fix static linking with libmad
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>
| -rw-r--r-- | package/ltris/ltris.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk index e77f2ac931..530e11e06b 100644 --- a/package/ltris/ltris.mk +++ b/package/ltris/ltris.mk @@ -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)) |
