diff options
| -rw-r--r-- | meta/packages/clutter/clutter-1.0_git.bb | 6 | ||||
| -rw-r--r-- | meta/packages/clutter/clutter/nodolt-1.0.patch | 12 | ||||
| -rw-r--r-- | meta/packages/clutter/clutter_git.bb | 4 |
3 files changed, 9 insertions, 13 deletions
diff --git a/meta/packages/clutter/clutter-1.0_git.bb b/meta/packages/clutter/clutter-1.0_git.bb index 8773e7204..7e62954ee 100644 --- a/meta/packages/clutter/clutter-1.0_git.bb +++ b/meta/packages/clutter/clutter-1.0_git.bb @@ -7,10 +7,14 @@ PACKAGES =+ "clutter-examples-1.0" FILES_clutter-examples-1.0 = "${bindir}/test-* ${pkgdatadir}/redhand.png" SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-1.0 \ - file://nodolt-1.0.patch;patch=1 \ file://enable_tests-1.0.patch;patch=1 " S = "${WORKDIR}/git" BASE_CONF += "--disable-introspection" + +do_configure_prepend () { + # Disable DOLT + sed -i -e 's/^DOLT//' ${S}/configure.ac +} diff --git a/meta/packages/clutter/clutter/nodolt-1.0.patch b/meta/packages/clutter/clutter/nodolt-1.0.patch deleted file mode 100644 index 74c249666..000000000 --- a/meta/packages/clutter/clutter/nodolt-1.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac 2009-11-27 15:32:20.000000000 +0000 -+++ git/configure.ac 2009-11-27 15:32:28.000000000 +0000 -@@ -79,7 +79,6 @@ - AM_PROG_CC_C_O - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --DOLT - - # Checks for header files. - AC_HEADER_STDC diff --git a/meta/packages/clutter/clutter_git.bb b/meta/packages/clutter/clutter_git.bb index c6204e138..9432615e2 100644 --- a/meta/packages/clutter/clutter_git.bb +++ b/meta/packages/clutter/clutter_git.bb @@ -10,3 +10,7 @@ S = "${WORKDIR}/git" BASE_CONF += "--disable-introspection" +do_configure_prepend () { + # Disable DOLT + sed -i -e 's/^DOLT//' ${S}/configure.ac +}
\ No newline at end of file |