remove bad patch

2014-11-20 00:22:58 -05:00
parent 3abb43f928
commit 1de46d10a7
2 changed files with 0 additions and 46 deletions
@@ -1,45 +0,0 @@
-From 12bc4bb5708299b736a144d5ed134ce885bd136b Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Wed, 19 Nov 2014 20:01:08 -0500
-Subject: [PATCH] configure: allow local-rust-root to be given a direct path to
- rustc
-
---
- configure | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/configure b/configure
-index a5c6aa8..c6910cc 100755
--- a/configure
-+++ b/configure
-@@ -690,18 +690,19 @@ fi
- if [ ! -z "$CFG_ENABLE_LOCAL_RUST" ]
- then
-     system_rustc=$(which rustc)
-    if [ -f ${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF} ]
-    then
-        : # everything already configured
-    elif [ -n "$system_rustc" ]
-    then
-        # we assume that rustc is in a /bin directory
-        CFG_LOCAL_RUST_ROOT=${system_rustc%/bin/rustc}
-+    c="${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF}"
-+    if [ -x "$c" ] && [ -f "$c" ]; then
-+        CFG_LOCAL_RUST_ROOT="$c"
-+    elif [ -x "${CFG_LOCAL_RUST_ROOT}" ] && [ -f "${CFG_LOCAL_RUST_ROOT}" ]; then
-+        # everything is already configured
-+        :
-+    elif [ -n "$system_rustc" ]; then
-+        CFG_LOCAL_RUST_ROOT=${system_rustc}
-     else
-         err "no local rust to use"
-     fi
- 
-    CMD="${CFG_LOCAL_RUST_ROOT}/bin/rustc${BIN_SUF}"
-+    CMD="${CFG_LOCAL_RUST_ROOT}"
-     LRV=`$CMD --version`
-     if [ $? -ne 0 ]
-     then
-- 
-2.1.3
-
@@ -18,5 +18,4 @@ SRC_URI_append = "\
 	file://0059-rustdoc-avoid-supplying-a-bad-default-sysroot-so-the.patch \
 	file://0060-src-etc-install.sh-use-LIBDIR-and-BINDIR-RELATIVE.patch \
 	file://0061-configure-silence-warning-about-LOCAL_RUST_ROOT-bein.patch \
-	file://0062-configure-allow-local-rust-root-to-be-given-a-direct.patch \
 "