diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-04-22 17:36:22 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-04-22 17:36:22 +0100 |
commit | b2a619b79eff718317bec201a37ea5f6f92f6d46 (patch) | |
tree | a7c4474408497bec110c5faa9cf9bb1887323fd7 /meta/packages/mutter/mutter/crosscompile.patch | |
parent | ef5600cf10bc3d2cd2748deb5b532524ad1fa2e1 (diff) | |
download | poky-b2a619b79eff718317bec201a37ea5f6f92f6d46.tar.gz |
metacity-clutter: Rename to mutter and point at the new upstream
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/mutter/mutter/crosscompile.patch')
-rw-r--r-- | meta/packages/mutter/mutter/crosscompile.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta/packages/mutter/mutter/crosscompile.patch b/meta/packages/mutter/mutter/crosscompile.patch new file mode 100644 index 0000000000..b27383b09a --- /dev/null +++ b/meta/packages/mutter/mutter/crosscompile.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | Index: git/configure.in | ||
2 | =================================================================== | ||
3 | --- git.orig/configure.in 2009-01-27 14:49:10.000000000 +0000 | ||
4 | +++ git/configure.in 2009-01-27 15:29:41.000000000 +0000 | ||
5 | @@ -46,6 +46,32 @@ | ||
6 | AC_LIBTOOL_WIN32_DLL | ||
7 | AM_PROG_LIBTOOL | ||
8 | |||
9 | +if test x"$CC_FOR_BUILD" = x; then | ||
10 | + if test x"$cross_compiling" = xyes; then | ||
11 | + AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc) | ||
12 | + else | ||
13 | + CC_FOR_BUILD="$CC" | ||
14 | + fi | ||
15 | +fi | ||
16 | +AC_SUBST([CC_FOR_BUILD]) | ||
17 | +if test x"$CFLAGS_FOR_BUILD" = x; then | ||
18 | + if test x"$cross_compiling" = xyes; then | ||
19 | + AC_CHECK_PROGS(CFLAGS_FOR_BUILD, gcc cc) | ||
20 | + else | ||
21 | + CFLAGS_FOR_BUILD="$CFLAGS" | ||
22 | + fi | ||
23 | +fi | ||
24 | +AC_SUBST([CFLAGS_FOR_BUILD]) | ||
25 | +if test x"$LDFLAGS_FOR_BUILD" = x; then | ||
26 | + if test x"$cross_compiling" = xyes; then | ||
27 | + AC_CHECK_PROGS(LDFLAGS_FOR_BUILD, gcc cc) | ||
28 | + else | ||
29 | + LDFLAGS_FOR_BUILD="$LDFLAGS" | ||
30 | + fi | ||
31 | +fi | ||
32 | +AC_SUBST([LDFLAGS_FOR_BUILD]) | ||
33 | + | ||
34 | + | ||
35 | #### Integer sizes | ||
36 | |||
37 | AC_CHECK_SIZEOF(char) | ||
38 | Index: git/src/Makefile.am | ||
39 | =================================================================== | ||
40 | --- git.orig/src/Makefile.am 2009-01-27 15:25:31.000000000 +0000 | ||
41 | +++ git/src/Makefile.am 2009-01-27 15:39:54.000000000 +0000 | ||
42 | @@ -168,11 +168,9 @@ | ||
43 | metacity_dialog_SOURCES= \ | ||
44 | ui/metacity-dialog.c | ||
45 | |||
46 | -schema_bindings_SOURCES = \ | ||
47 | - core/schema-bindings.c \ | ||
48 | - metacity.schemas.in.in | ||
49 | +schema_bindings: | ||
50 | + @CC_FOR_BUILD@ core/schema-bindings.c -I./include -I ../ @CFLAGS_FOR_BUILD@ @LDFLAGS_FOR_BUILD@ -o schema_bindings | ||
51 | |||
52 | -schema_bindings_LDADD = @METACITY_LIBS@ | ||
53 | metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in | ||
54 | @echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in | ||
55 | ${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in | ||