[oe-commits] Henning Heinold : gnome-games: fix sdl in configure.ac
git version control
git at git.openembedded.org
Mon Nov 30 15:54:55 UTC 2009
Module: openembedded.git
Branch: shr-testing2009
Commit: cfba2ac2e3846bb16237cf97f33f855fd330c3c8
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=cfba2ac2e3846bb16237cf97f33f855fd330c3c8
Author: Henning Heinold <heinold at inf.fu-berlin.de>
Date: Mon Nov 30 01:52:40 2009 +0100
gnome-games: fix sdl in configure.ac
* gnome-games ships an older sdl.m4 macro which *sigh* modfiy
the path in configure and prepend /usr to the path variable
removing the sdl.m4 and use the one we ship original, solves
the problem, problem occured while guile from hostsystem was
draged in and linker bailed about wrong format, this was a side
effect of the path-manipulation from the sdl.m4
---
recipes/gnome/gnome-games_2.24.0.bb | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/recipes/gnome/gnome-games_2.24.0.bb b/recipes/gnome/gnome-games_2.24.0.bb
index b4e7cf4..20221bd 100644
--- a/recipes/gnome/gnome-games_2.24.0.bb
+++ b/recipes/gnome/gnome-games_2.24.0.bb
@@ -16,21 +16,14 @@ EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \
INTLTOOL_PERL=${STAGING_BINDIR_NATIVE}/perl \
"
+# disable help dir and crappy old sdl-macro
do_configure_prepend() {
+ rm m4/sdl.m4
for i in $(find ${S} -name "Makefile.am") ; do
sed -i -e s:help::g $i
done
}
-do_configure_append() {
- for i in $(find ${S} -name "Makefile") ; do
- sed -i \
- -e s:'-I/usr/include/SDL':'-I${STAGING_INCDIR}/SDL':g \
- -e s:'-I/usr/local/include/SDL':'-I${STAGING_INCDIR}/SDL':g \
- $i
- done
-}
-
# copy matchbox icons
do_install_append() {
install -m 0644 ${D}/${datadir}/icons/hicolor/48x48/apps/* ${D}/${datadir}/pixmaps
More information about the Openembedded-commits
mailing list