diff options
| author | Koen Kooi <koen@openembedded.org> | 2010-04-01 21:39:10 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-04-01 22:24:30 +0200 |
| commit | 7334b395fc3efcd97529ecfbd2540f823e579163 (patch) | |
| tree | 7973a7479a6c2775ea6edf245d5f164a37dff2fc /recipes/gnome | |
| parent | 608eacf950dbba1100e3fd428ff33418511e84ba (diff) | |
metacity: add 2.30, cross compile patch partially stolen from poky
Diffstat (limited to 'recipes/gnome')
| -rw-r--r-- | recipes/gnome/metacity/crosscompile.patch | 53 | ||||
| -rw-r--r-- | recipes/gnome/metacity_2.30.0.bb | 8 |
2 files changed, 60 insertions, 1 deletions
diff --git a/recipes/gnome/metacity/crosscompile.patch b/recipes/gnome/metacity/crosscompile.patch new file mode 100644 index 0000000000..bc33dfb8e4 --- /dev/null +++ b/recipes/gnome/metacity/crosscompile.patch @@ -0,0 +1,53 @@ +Index: git/src/Makefile.am +=================================================================== +--- git.orig/src/Makefile.am 2009-01-27 15:25:31.000000000 +0000 ++++ git/src/Makefile.am 2009-01-27 15:39:54.000000000 +0000 +@@ -168,11 +168,9 @@ + metacity_dialog_SOURCES= \ + ui/metacity-dialog.c + +-schema_bindings_SOURCES = \ +- core/schema-bindings.c \ +- metacity.schemas.in.in ++schema_bindings: ++ @CC_FOR_BUILD@ core/schema-bindings.c -I./include -I$(STAGING_LIBDIR_NATIVE)/glib-2.0/include -I$(STAGING_INCDIR_NATIVE)/glib-2.0 -I$(STAGING_INCDIR_NATIVE) -I../ @CFLAGS_FOR_BUILD@ @LDFLAGS_FOR_BUILD@ -L$(STAGING_LIBDIR_NATIVE) -lglib-2.0 -o schema_bindings + +-schema_bindings_LDADD = @METACITY_LIBS@ + metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in + @echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in + ${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in +--- /tmp/configure.in 2010-04-01 20:52:17.000000000 +0200 ++++ metacity-2.30.0/configure.in 2010-04-01 20:53:14.000000000 +0200 +@@ -31,6 +31,32 @@ + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL + ++if test x"$CC_FOR_BUILD" = x; then ++ if test x"$cross_compiling" = xyes; then ++ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc) ++ else ++ CC_FOR_BUILD="$CC" ++ fi ++fi ++AC_SUBST([CC_FOR_BUILD]) ++if test x"$CFLAGS_FOR_BUILD" = x; then ++ if test x"$cross_compiling" = xyes; then ++ echo boo! ++ else ++ CFLAGS_FOR_BUILD="$CFLAGS" ++ fi ++fi ++AC_SUBST([CFLAGS_FOR_BUILD]) ++if test x"$LDFLAGS_FOR_BUILD" = x; then ++ if test x"$cross_compiling" = xyes; then ++ echo boo! ++ else ++ LDFLAGS_FOR_BUILD="$LDFLAGS" ++ fi ++fi ++AC_SUBST([LDFLAGS_FOR_BUILD]) ++ ++ + #### Integer sizes + + AC_CHECK_SIZEOF(char) diff --git a/recipes/gnome/metacity_2.30.0.bb b/recipes/gnome/metacity_2.30.0.bb index 1c2ff761c9..7b59b436bf 100644 --- a/recipes/gnome/metacity_2.30.0.bb +++ b/recipes/gnome/metacity_2.30.0.bb @@ -7,16 +7,22 @@ DEPENDS = "libcanberra libwnck startup-notification gtk+ gconf gdk-pixbuf-csourc inherit gnome update-alternatives +SRC_URI += "file://crosscompile.patch;patch=1 " + SRC_URI[archive.md5sum] = "7c8a4c8f3b667efcc60f286adb445d4c" SRC_URI[archive.sha256sum] = "5c4e2af2216de022181f692f15427361a1dae3d30756ef89b97a11ff5bd50b22" EXTRA_OECONF += "--disable-verbose \ - --disable-xinerama" + --disable-xinerama \ + --without-introspectiom \ +" do_configure_prepend() { sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in } +EXTRA_OEMAKE = ' STAGING_INCDIR_NATIVE="${STAGING_INCDIR_NATIVE}" STAGING_LIBDIR_NATIVE="${STAGING_LIBDIR_NATIVE}"' + ALTERNATIVE_NAME = "x-window-manager" ALTERNATIVE_LINK = "${bindir}/x-window-manager" ALTERNATIVE_PATH = "${bindir}/metacity" |