Skip to contentSkip to conversation

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

PATCH In review Roderick Taylor 2 participants 2 messages Mar 4, 2011

lore
Share & tools
lore
#0 lore raw

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

* package patch to pretend that automake is missing.

---
 .../dont-automake.patch                            |   21 ++++++++++++++++++++
 recipes/gnome/system-tools-backends_2.10.1.bb      |    1 +
 2 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100644 recipes/gnome/system-tools-backends-2.10.1/dont-automake.patch
recipes/gnome/system-tools-backends-2.10.1/dont-automake.patch new file +21 -0
new file mode 100644
index 0000000..a9cea79
@@ -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
recipes/gnome/system-tools-backends_2.10.1.bb +1 -0
index 75dfda9..bac0a9c 100644
@@ -16,6 +16,7 @@ SRC_URI[archive.sha256sum] = "0c1cfdf5f0550c0ccacbbc4f00ed059ab9ea483d48138132db
 
 SRC_URI += " \
             file://system-tools-backends \
+	    file://dont-automake.patch \
            "
 
 SRC_URI_append_angstrom = " \
Signature · 1 line
1.7.3.4
Acked-by on v1 1/1
#1 lore raw

I'm not sure this is perfect (I see a strip error in my build), but it does let the package build on my Fedora machine now.

Pushing.

Philip

Quoted 48 lines · Roderick Taylor

* package patch to pretend that automake is missing.

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

create mode 100644 recipes/gnome/system-tools-backends-2.10.1/dont-automake.patch

recipes/gnome/system-tools-backends-2.10.1/dont-automake.patch new file +21 -0
new file mode 100644
index 0000000..a9cea79
@@ -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
recipes/gnome/system-tools-backends_2.10.1.bb +1 -0
index 75dfda9..bac0a9c 100644
@@ -16,6 +16,7 @@ SRC_URI[archive.sha256sum] = "0c1cfdf5f0550c0ccacbbc4f00ed059ab9ea483d48138132db
 
  SRC_URI += " \
              file://system-tools-backends \
+	    file://dont-automake.patch \
             "
 
  SRC_URI_append_angstrom = " \