diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
| commit | b108fdcb83d457e5d43298fb93dbfd805d076f24 (patch) | |
| tree | 7fbd64a13fc915f5cea93708419cb3c6aa1b40ea /package/sdl | |
| parent | a6cfaea44e5105cb66e4e797042f64335f5e7c01 (diff) | |
| parent | 9e40a1005f51d10784db295797ed270a130d79d5 (diff) | |
Merge branch 'next'
Conflicts:
Makefile
package/dmraid/Config.in
package/gdb/Config.in.host
package/linux-headers/linux-headers.mk
package/python/python.mk
package/python3/python3.mk
package/rt-tests/Config.in
package/sdl/sdl.mk
package/systemd/systemd-01-fix-getty-unit.patch
package/systemd/systemd-02-fix-page-size.patch
package/systemd/systemd-03-uclibc-fix.patch
package/udev/Config.in
package/udisks/Config.in
package/vlc/vlc.mk
system/Config.in
Quite some merge conflicts, hopefully I didn't screw up anything.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/sdl')
| -rw-r--r-- | package/sdl/sdl.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 510acd99f..d5fb3311c 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -18,8 +18,9 @@ define SDL_RUN_AUTOGEN endef SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN -SDL_DEPENDENCIES += host-automake host-autoconf host-libtool +HOST_SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN +SDL_DEPENDENCIES += host-automake host-autoconf host-libtool ifeq ($(BR2_PACKAGE_SDL_FBCON),y) SDL_CONF_OPT += --enable-video-fbcon=yes @@ -80,3 +81,4 @@ endef SDL_POST_INSTALL_STAGING_HOOKS += SDL_FIXUP_SDL_CONFIG $(eval $(autotools-package)) +$(eval $(host-autotools-package)) |