diff options
| author |   woglinde <heinold@inf.fu-berlin.de> | 2008-10-18 21:59:01 +0200 |
|---|---|---|
| committer | woglinde <heinold@inf.fu-berlin.de> | 2008-10-18 22:32:24 +0200 |
| commit | 8b5e3f5fce5605e2bd0fc8b36b85809c65764acd (patch) | |
| tree | edc2a36fe577fb7125c94313003694690053f567 | |
| parent | 3a44c41ea3993ef7899f49228eab5874ae0bfb04 (diff) | |
| download | openembedded-8b5e3f5fce5605e2bd0fc8b36b85809c65764acd.tar.gz | |
libsdl-x11: fix sdl.m4 for sdl-config
* there is a stupid PATH setting which is using the host
stuff, just removed it and our staging sdl-config is found
* bump PR
| -rw-r--r-- | packages/libsdl/files/fixmfour.patch | 14 | ||||
| -rw-r--r-- | packages/libsdl/libsdl-x11_1.2.11.bb | 3 |
2 files changed, 16 insertions, 1 deletions
diff --git a/packages/libsdl/files/fixmfour.patch b/packages/libsdl/files/fixmfour.patch new file mode 100644 index 0000000000..0d534bd9a1 --- /dev/null +++ b/packages/libsdl/files/fixmfour.patch @@ -0,0 +1,14 @@ +Index: SDL-1.2.11/sdl.m4 +=================================================================== +--- SDL-1.2.11.orig/sdl.m4 2008-10-18 21:20:13.482478928 +0200 ++++ SDL-1.2.11/sdl.m4 2008-10-18 21:20:28.979441480 +0200 +@@ -32,9 +32,6 @@ + fi + fi + +- if test "x$prefix" != xNONE; then +- PATH="$prefix/bin:$prefix/usr/bin:$PATH" +- fi + AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) + min_sdl_version=ifelse([$1], ,0.11.0,$1) + AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) diff --git a/packages/libsdl/libsdl-x11_1.2.11.bb b/packages/libsdl/libsdl-x11_1.2.11.bb index 809c9852f8..e9628d9e07 100644 --- a/packages/libsdl/libsdl-x11_1.2.11.bb +++ b/packages/libsdl/libsdl-x11_1.2.11.bb @@ -3,7 +3,7 @@ require libsdl.inc # extra-keys.patch is missing DEFAULT_PREFERENCE = "-1" -FILE_PR = "r6" +FILE_PR = "r7" SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ @@ -12,6 +12,7 @@ SRC_URI = "\ file://pagesize.patch;patch=1 \ file://kernel-asm-page.patch;patch=1 \ file://sdl-cdfix.patch;patch=1 \ + file://fixmfour.patch;patch=1 \ " EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ |