diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-03-19 12:19:54 +0000 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-03-19 12:30:14 +0000 |
| commit | 6526d314924da209760f470d45febd01b2a534aa (patch) | |
| tree | 6104c3d822d0e8e307dcb1049d872aacbda14344 | |
| parent | 98d29b86c82ef4271e8406733fd0ffe802a1b291 (diff) | |
| download | openembedded-core-6526d314924da209760f470d45febd01b2a534aa.tar.gz openembedded-core-6526d314924da209760f470d45febd01b2a534aa.tar.bz2 openembedded-core-6526d314924da209760f470d45febd01b2a534aa.zip | |
clutter: Fix building version 0.8
Fix building of Clutter with new Automake
Signed-off-by: Joshua Lock <josh@linux.intel.com>
| -rw-r--r-- | meta/packages/clutter/clutter-0.8_git.bb | 3 | ||||
| -rw-r--r-- | meta/packages/clutter/clutter/build-fix.patch | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/meta/packages/clutter/clutter-0.8_git.bb b/meta/packages/clutter/clutter-0.8_git.bb index 42efd3b109..71e6198030 100644 --- a/meta/packages/clutter/clutter-0.8_git.bb +++ b/meta/packages/clutter/clutter-0.8_git.bb @@ -7,6 +7,7 @@ PACKAGES =+ "clutter-examples-0.8" FILES_clutter-examples-0.8 = "${bindir}/test-* ${pkgdatadir}/redhand.png" SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8 \ - file://enable_tests-0.8.patch;patch=1 " + file://enable_tests-0.8.patch;patch=1 \ + file://build-fix.patch;patch=1" S = "${WORKDIR}/git" diff --git a/meta/packages/clutter/clutter/build-fix.patch b/meta/packages/clutter/clutter/build-fix.patch new file mode 100644 index 0000000000..68cf84ec22 --- /dev/null +++ b/meta/packages/clutter/clutter/build-fix.patch @@ -0,0 +1,16 @@ +Installing the same file twice causes an error in Automake 1.11 + +JL 19/03/10 + +Index: git/clutter/Makefile.am +=================================================================== +--- git.orig/clutter/Makefile.am 2010-03-19 11:37:51.000000000 +0000 ++++ git/clutter/Makefile.am 2010-03-19 11:50:46.744042007 +0000 +@@ -219,7 +219,6 @@ + $(source_h) \ + clutter-json.h \ + clutter-enum-types.h \ +- clutter-version.h \ + clutter.h + + DISTCLEANFILES = \ |