aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2014-06-15 04:25:20 +0300
committerMartin Jansa <Martin.Jansa@gmail.com>2014-06-21 10:32:31 +0200
commitd12abd8fea19d2c0b80dfc31b09c4cb7bbfacb0b (patch)
tree04b82a44d60421d7f4877c279a55a1322fdab63e
parent497dc74fb3cc755c30cf554a59b458a117cdb072 (diff)
downloadmeta-openembedded-contrib-d12abd8fea19d2c0b80dfc31b09c4cb7bbfacb0b.tar.gz
libsdl-ttf: 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@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb
index c6e5a15ff7..0127b31812 100644
--- a/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb
+++ b/meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb
@@ -4,7 +4,7 @@ DEPENDS = "virtual/libsdl freetype"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${PV}.tar.gz \
file://configure.patch \
@@ -18,11 +18,12 @@ inherit autotools
TARGET_CC_ARCH += "${LDFLAGS}"
do_configure_prepend() {
-
+
+ # Removing these files fixes a libtool version mismatch.
MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
-
+
for i in ${MACROS}; do
- rm acinclude/$i
+ rm ${S}/acinclude/$i
done
}