All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] system-tools-backends: don't use build machine's automake-1.7
@ 2011-03-04  1:04 Roderick Taylor
  2011-03-04  2:34 ` Philip Balister
  0 siblings, 1 reply; 2+ messages in thread
From: Roderick Taylor @ 2011-03-04  1:04 UTC (permalink / raw)
  To: openembedded-devel

* package patch to pretend that automake is missing.

Signed-off-by: Roderick Taylor <myopiate@gmail.com>
---
 .../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

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 = " \
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] system-tools-backends: don't use build machine's automake-1.7
  2011-03-04  1:04 [PATCH] system-tools-backends: don't use build machine's automake-1.7 Roderick Taylor
@ 2011-03-04  2:34 ` Philip Balister
  0 siblings, 0 replies; 2+ messages in thread
From: Philip Balister @ 2011-03-04  2:34 UTC (permalink / raw)
  To: openembedded-devel

Acked-by: Philip Balister <philip@balister.org>

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

On 03/03/2011 08:04 PM, Roderick Taylor wrote:
> * package patch to pretend that automake is missing.
>
> Signed-off-by: Roderick Taylor<myopiate@gmail.com>
> ---
>   .../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
>
> 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 = " \



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-03-04  2:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-04  1:04 [PATCH] system-tools-backends: don't use build machine's automake-1.7 Roderick Taylor
2011-03-04  2:34 ` Philip Balister

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.