[oe-commits] Marko Lindqvist : libsdl-image: Fix build with separate builddir

git at git.openembedded.org git at git.openembedded.org
Mon Jun 16 14:17:15 UTC 2014


Module: meta-openembedded.git
Branch: master-next
Commit: 7e822196516552e735b4e3db49a063f75e6bc140
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=7e822196516552e735b4e3db49a063f75e6bc140

Author: Marko Lindqvist <cazfi74 at gmail.com>
Date:   Sun Jun 15 04:25:19 2014 +0300

libsdl-image: Fix build with separate builddir

Do not assume that sources are in the current directory in
do_configure_prepend() but refer to them with path to source directory.

Signed-off-by: Marko Lindqvist <cazfi74 at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../libsdl-image/libsdl-image_1.2.12.bb                  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
index ef78927..d8c56fb 100644
--- a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
+++ b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb
@@ -20,12 +20,12 @@ export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
 EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared"
 
 do_configure_prepend() {
-    # Removing this file fixes a libtool version mismatch.
-    rm -f acinclude/libtool.m4
-    rm -f acinclude/sdl.m4
-    rm -f acinclude/pkg.m4
-    rm -f acinclude/lt~obsolete.m4
-    rm -f acinclude/ltoptions.m4
-    rm -f acinclude/ltsugar.m4
-    rm -f acinclude/ltversion.m4
+    # Removing these files fixes a libtool version mismatch.
+    rm -f ${S}/acinclude/libtool.m4
+    rm -f ${S}/acinclude/sdl.m4
+    rm -f ${S}/acinclude/pkg.m4
+    rm -f ${S}/acinclude/lt~obsolete.m4
+    rm -f ${S}/acinclude/ltoptions.m4
+    rm -f ${S}/acinclude/ltsugar.m4
+    rm -f ${S}/acinclude/ltversion.m4
 }



More information about the Openembedded-commits mailing list