diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-27 15:44:07 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-27 15:44:07 +0000 |
| commit | 463c2d644939f54854d27cf0f0afc0a3bf762968 (patch) | |
| tree | 5746da8641a862c313bdf3e54e85533534be4557 | |
| parent | d9c8f31557504b38b0b084791e49539b07334f1e (diff) | |
| download | openembedded-core-463c2d644939f54854d27cf0f0afc0a3bf762968.tar.gz openembedded-core-463c2d644939f54854d27cf0f0afc0a3bf762968.tar.bz2 openembedded-core-463c2d644939f54854d27cf0f0afc0a3bf762968.zip | |
metacity-clutter: Add cross compile patch so compiles on x86_64 work for i386 targets
| -rw-r--r-- | meta/packages/gnome/metacity-clutter/crosscompile.patch | 55 | ||||
| -rw-r--r-- | meta/packages/gnome/metacity-clutter_git.bb | 9 |
2 files changed, 62 insertions, 2 deletions
diff --git a/meta/packages/gnome/metacity-clutter/crosscompile.patch b/meta/packages/gnome/metacity-clutter/crosscompile.patch new file mode 100644 index 0000000000..b27383b09a --- /dev/null +++ b/meta/packages/gnome/metacity-clutter/crosscompile.patch @@ -0,0 +1,55 @@ +Index: git/configure.in +=================================================================== +--- git.orig/configure.in 2009-01-27 14:49:10.000000000 +0000 ++++ git/configure.in 2009-01-27 15:29:41.000000000 +0000 +@@ -46,6 +46,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 ++ AC_CHECK_PROGS(CFLAGS_FOR_BUILD, gcc cc) ++ 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 ++ AC_CHECK_PROGS(LDFLAGS_FOR_BUILD, gcc cc) ++ else ++ LDFLAGS_FOR_BUILD="$LDFLAGS" ++ fi ++fi ++AC_SUBST([LDFLAGS_FOR_BUILD]) ++ ++ + #### Integer sizes + + AC_CHECK_SIZEOF(char) +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 ../ @CFLAGS_FOR_BUILD@ @LDFLAGS_FOR_BUILD@ -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 diff --git a/meta/packages/gnome/metacity-clutter_git.bb b/meta/packages/gnome/metacity-clutter_git.bb index 94e25a8b4a..00d9a9427e 100644 --- a/meta/packages/gnome/metacity-clutter_git.bb +++ b/meta/packages/gnome/metacity-clutter_git.bb @@ -1,13 +1,14 @@ SECTION = "x11/wm" DESCRIPTION = "Metacity is the boring window manager for the adult in you." LICENSE = "GPL" -DEPENDS = "startup-notification gtk+ gconf clutter-0.8 gdk-pixbuf-csource-native intltool" -PR = "r7" +DEPENDS = "startup-notification gtk+ gconf clutter-0.8 gdk-pixbuf-csource-native intltool glib-2.0-native" +PR = "r8" PV = "2.25.1+git${SRCREV}" inherit gnome update-alternatives SRC_URI = "git://git.o-hand.com/metacity-clutter.git;protocol=git;branch=clutter \ file://nodocs.patch;patch=1 \ + file://crosscompile.patch;patch=1 \ file://fix_pkgconfig.patch;patch=1" S = "${WORKDIR}/git" @@ -23,6 +24,10 @@ EXTRA_OECONF += "--disable-verbose \ FILES_${PN} += "${datadir}/themes ${libdir}/metacity/plugins/clutter/*.so" FILES_${PN}-dbg += "${libdir}/metacity/plugins/clutter/.debug/*" +export CC_FOR_BUILD = "${BUILD_CC}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include" +export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS} -L${STAGING_LIBDIR_NATIVE} -lglib-2.0" + do_configure_prepend () { echo "EXTRA_DIST=" > ${S}/gnome-doc-utils.make } |