[oe-commits] org.oe.dev libsdl: Remove PATH setting from sdl.m4, it breaks things

[rpurdie commit]

libsdl: Remove PATH setting from sdl.m4, it breaks things

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 5934a5354a12b0f561c124de42a7e318edaed79c
ViewMTN: http://monotone.openembedded.org/revision/info/5934a5354a12b0f561c124de42a7e318edaed79c
Files:
1
packages/libsdl/files/remove_path.patch
packages/libsdl/libsdl.inc
Diffs:

#
# mt diff -rcb2e1d76efbf9a333e234f1583fdc331b6585d0e -r5934a5354a12b0f561c124de42a7e318edaed79c
#
# 
# 
# add_file "packages/libsdl/files/remove_path.patch"
#  content [dcce0ab5c0b4be705c72b5aea227bda9466517e5]
# 
# patch "packages/libsdl/libsdl.inc"
#  from [50d941276aa6e48d473b59355b178be3c185f8c5]
#    to [73a8a92adcaa61e6c3b7b512c43388a36533129a]
# 
============================================================
--- packages/libsdl/files/remove_path.patch	dcce0ab5c0b4be705c72b5aea227bda9466517e5
+++ packages/libsdl/files/remove_path.patch	dcce0ab5c0b4be705c72b5aea227bda9466517e5
@@ -0,0 +1,18 @@
+OE goes to great lengths to set PATH correctly and this just breaks
+things since local sdl-config binaries will suddenly be preferred
+rather than those in staging.
+
+RP - 27/02/2008
+
+Index: SDL-1.2.9/sdl.m4
+===================================================================
+--- SDL-1.2.9.orig/sdl.m4	2008-02-27 10:08:38.000000000 +0000
++++ SDL-1.2.9/sdl.m4	2008-02-27 10:08:51.000000000 +0000
+@@ -33,7 +33,6 @@
+   fi
+ 
+   AC_REQUIRE([AC_CANONICAL_TARGET])
+-  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+   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)
============================================================
--- packages/libsdl/libsdl.inc	50d941276aa6e48d473b59355b178be3c185f8c5
+++ packages/libsdl/libsdl.inc	73a8a92adcaa61e6c3b7b512c43388a36533129a
@@ -1,15 +1,16 @@ LICENSE = "LGPL"
 DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "alsa-lib mesa virtual/libx11 libxext"
 PROVIDES = "virtual/libsdl"
 LICENSE = "LGPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "\
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
   file://extra-keys.patch;patch=1 \
   file://pagesize.patch;patch=1 \
+  file://remove_path.patch;patch=1 \
   file://acinclude.m4"
 S = "${WORKDIR}/SDL-${PV}"