[gnome-continuous] rust-buildapi.patch: Try to install from binaries

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 8c0cd72eeab886cee5691887ba993b02edccb59d
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Mar 27 16:56:01 2017 +0100

    rust-buildapi.patch: Try to install from binaries
    
    Building from source rust scripts try to connect to rust's servers
    We do not support that in continuous:
    
    http://build.gnome.org/continuous/buildmaster/builds/2017/03/27/47/build/log-rust.txt

 manifest.json               |    4 +-
 patches/rust-buildapi.patch |   68 +++++++++++++++++++-----------------------
 2 files changed, 33 insertions(+), 39 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 306dc4c..aab8804 100644
--- a/manifest.json
+++ b/manifest.json
@@ -686,9 +686,9 @@
 
                {"src": "gnome:libcroco"},
 
-               {"src": "tarball:https://static.rust-lang.org/dist/rustc-1.16.0-src.tar.gz";,
+               {"src": 
"tarball:https://static.rust-lang.org/dist/rust-1.16.0-x86_64-unknown-linux-gnu.tar.gz";,
                 "name": "rust",
-                "checksum": "f966b31eb1cd9bd2df817c391a338eeb5b9253ae0a19bf8a11960c560f96e8b4",
+                "checksum": "48621912c242753ba37cad5145df375eeba41c81079df46f93ffb4896542e8fd",
                 "patches": ["rust-buildapi.patch"]},
 
                {"src": "gnome:librsvg",
diff --git a/patches/rust-buildapi.patch b/patches/rust-buildapi.patch
index e1b5714..b6e1280 100644
--- a/patches/rust-buildapi.patch
+++ b/patches/rust-buildapi.patch
@@ -1,46 +1,40 @@
-From 6601379a071ee2c5e7ce4868514d29f97599501b Mon Sep 17 00:00:00 2001
+From eb6719b1722f1c07c70f173b9d4131d13b6759d0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon gnome org>
-Date: Mon, 27 Mar 2017 14:31:55 +0100
-Subject: [PATCH] configure: Do not error if the configure option is not
- recognized
+Date: Mon, 27 Mar 2017 16:38:50 +0100
+Subject: [PATCH] build-sys: Add configure and Makefile
 
-Also hardcode CFG_TARGET and CFG_HOST; they are not picked up correctly:
-"configure: error: unsupported target triples "x86_64-linux" found"
+Implement the GNOME Build API for Continuous.
+
+See: http://people.gnome.org/~walters/docs/build-api.txt
 ---
- configure | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ Makefile  | 6 ++++++
+ configure | 4 ++++
+ 2 files changed, 10 insertions(+)
+ create mode 100644 Makefile
+ create mode 100755 configure
 
+diff --git a/Makefile b/Makefile
+new file mode 100644
+index 0000000..92ec3cd
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,6 @@
++# rust *development* Makefile
++all:
++      ./install.sh --prefix=$(PREFIX) --destdir=$(DESTDIR)
++
++install:
++      ./install.sh --prefix=$(PREFIX) --destdir=$(DESTDIR)
 diff --git a/configure b/configure
-index 505767ce..fe0f9592 100755
---- a/configure
+new file mode 100755
+index 0000000..29eccbc
+--- /dev/null
 +++ b/configure
-@@ -174,7 +174,7 @@ validate_opt () {
-         else
-             if test $isArgValid -eq 0
-             then
--                err "Option '$arg' is not recognized"
-+                warn "Option '$arg' is not recognized"
-             fi
-         fi
-     done
-@@ -1200,7 +1200,9 @@ putvar CFG_STDCPP_NAME
- CFG_PREFIX=${CFG_PREFIX%/}
- CFG_MANDIR=${CFG_MANDIR%/}
- CFG_DOCDIR=${CFG_DOCDIR%/}
-+CFG_HOST=x86_64-unknown-linux-gnu
- CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
-+CFG_TARGET=x86_64-unknown-linux-gnu
- CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
- CFG_SUPPORTED_TARGET=""
- for target_file in ${CFG_SRC_DIR}mk/cfg/*.mk; do
-@@ -1224,6 +1226,7 @@ done
- CFG_TARGET=$V_TEMP
- 
- # check target-specific tool-chains
-+CFG_TARGET=x86_64-unknown-linux-gnu
- for i in $CFG_TARGET
- do
-     L_CHECK=false
+@@ -0,0 +1,4 @@
++#!/bin/bash
++# http://people.gnome.org/~walters/docs/build-api.txt
++#buildapi-variable-no-builddir
++exit 0
 -- 
 2.12.1