[oe-commits] Roderick Taylor : system-tools-backends: don't use build machine' s automake-1.7

git version control git at git.openembedded.org
Fri May 27 17:47:28 UTC 2011


Module: openembedded.git
Branch: 2011.03-maintenance
Commit: f51e99f64df0b929627c26dea7ca3cbf720e7b86
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=f51e99f64df0b929627c26dea7ca3cbf720e7b86

Author: Roderick Taylor <myopiate at gmail.com>
Date:   Fri Mar  4 09:04:53 2011 +0000

system-tools-backends: don't use build machine's automake-1.7

* package patch to pretend that automake is missing.

Signed-off-by: Roderick Taylor <myopiate at gmail.com>
Acked-by: Philip Balister <philip at balister.org>
Signed-off-by: Philip Balister <philip at balister.org>

---

 .../dont-automake.patch                            |   21 ++++++++++++++++++++
 recipes/gnome/system-tools-backends_2.10.1.bb      |    1 +
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/recipes/gnome/system-tools-backends-2.10.1/dont-automake.patch b/recipes/gnome/system-tools-backends-2.10.1/dont-automake.patch
new file mode 100644
index 0000000..a9cea79
--- /dev/null
+++ b/recipes/gnome/system-tools-backends-2.10.1/dont-automake.patch
@@ -0,0 +1,21 @@
+Index: system-tools-backends-2.10.1/missing
+===================================================================
+--- system-tools-backends-2.10.1.orig/missing
++++ system-tools-backends-2.10.1/missing
+@@ -140,16 +140,6 @@ WARNING: \`$1' is missing on your system
+     ;;
+ 
+   automake*)
+-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+-       # We have it, but it failed.
+-       exit 1
+-    fi
+-
+-    echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
+-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+-         You might want to install the \`Automake' and \`Perl' packages.
+-         Grab them from any GNU archive site."
+     find . -type f -name Makefile.am -print |
+ 	   sed 's/\.am$/.in/' |
+ 	   while read f; do touch "$f"; done
diff --git a/recipes/gnome/system-tools-backends_2.10.1.bb b/recipes/gnome/system-tools-backends_2.10.1.bb
index 75dfda9..bac0a9c 100644
--- a/recipes/gnome/system-tools-backends_2.10.1.bb
+++ b/recipes/gnome/system-tools-backends_2.10.1.bb
@@ -16,6 +16,7 @@ SRC_URI[archive.sha256sum] = "0c1cfdf5f0550c0ccacbbc4f00ed059ab9ea483d48138132db
 
 SRC_URI += " \
             file://system-tools-backends \
+	    file://dont-automake.patch \
            "
 
 SRC_URI_append_angstrom = " \





More information about the Openembedded-commits mailing list