aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoderick Taylor <myopiate@gmail.com>2011-03-04 09:04:53 +0000
committerPhilip Balister <philip@balister.org>2011-03-03 22:07:09 -0500
commit6e294d9d3e403f8ed252b43c60405dfeee3f0164 (patch)
tree6295c09dac12c45643ed061918939130a3682c8c
parent688d359b9c832546239efb000a326202e8265d16 (diff)
downloadopenembedded-6e294d9d3e403f8ed252b43c60405dfeee3f0164.tar.gz
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@gmail.com> Acked-by: Philip Balister <philip@balister.org> Signed-off-by: Philip Balister <philip@balister.org>
-rw-r--r--recipes/gnome/system-tools-backends-2.10.1/dont-automake.patch21
-rw-r--r--recipes/gnome/system-tools-backends_2.10.1.bb1
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 0000000000..a9cea79a25
--- /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 75dfda968e..bac0a9cb16 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 = " \