[oe-commits] Marko Lindqvist : libsdl-ttf: Fix build with separate builddir
git at git.openembedded.org
git at git.openembedded.org
Thu Jun 19 10:05:40 UTC 2014
Module: meta-openembedded.git
Branch: master-next
Commit: 63abbb81383807d18a8bc1cfcc7ea7c3ae5ea5e3
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=63abbb81383807d18a8bc1cfcc7ea7c3ae5ea5e3
Author: Marko Lindqvist <cazfi74 at gmail.com>
Date: Sun Jun 15 04:25:20 2014 +0300
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 at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-support/libsdl-ttf/libsdl-ttf_2.0.10.bb | 9 +++++----
1 file 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 c6e5a15..0127b31 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
}
More information about the Openembedded-commits
mailing list