From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Mon, 5 Mar 2012 10:23:44 +0000 (+0100) Subject: [PATCH 2/2] Do not try to parse the options for --build and --host arguments X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=681522dc8db9c73a12ccc9c2141deecaee2f7fe5;p=notmuch-archives.git [PATCH 2/2] Do not try to parse the options for --build and --host arguments --- diff --git a/16/0b153e1eeddba0449940d0410c75f4bb2ae53b b/16/0b153e1eeddba0449940d0410c75f4bb2ae53b new file mode 100644 index 000000000..04a5d0cd6 --- /dev/null +++ b/16/0b153e1eeddba0449940d0410c75f4bb2ae53b @@ -0,0 +1,120 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 603EF431FC3 + for ; Mon, 5 Mar 2012 02:23:59 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id Sk1SXw5IE5Gr for ; + Mon, 5 Mar 2012 02:23:57 -0800 (PST) +Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id B00F3431FBC + for ; Mon, 5 Mar 2012 02:23:57 -0800 (PST) +Received: from mail.jade-hamburg.de (unknown [85.183.11.228]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by mail.cryptobitch.de (Postfix) with ESMTPSA id 84A22542632 + for ; Mon, 5 Mar 2012 11:23:56 +0100 (CET) +Received: by mail.jade-hamburg.de (Postfix, from userid 401) + id 06DBEDF2A3; Mon, 5 Mar 2012 11:23:56 +0100 (CET) +Received: from thinkbox.jade-hamburg.de (unknown [193.174.12.196]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) (Authenticated sender: teythoon) + by mail.jade-hamburg.de (Postfix) with ESMTPSA id B9A5ADF2A1; + Mon, 5 Mar 2012 11:23:50 +0100 (CET) +Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77) + (envelope-from ) + id 1S4V53-0002mr-BC; Mon, 05 Mar 2012 11:23:49 +0100 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +To: notmuch@notmuchmail.org +Subject: [PATCH 2/2] Do not try to parse the options for --build and --host + arguments +Date: Mon, 5 Mar 2012 11:23:44 +0100 +Message-Id: + <1330943024-10541-2-git-send-email-4winter@informatik.uni-hamburg.de> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: + <1330943024-10541-1-git-send-email-4winter@informatik.uni-hamburg.de> +References: <87k42zokjs.fsf@zancas.localnet> + <1330943024-10541-1-git-send-email-4winter@informatik.uni-hamburg.de> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 05 Mar 2012 10:23:59 -0000 + +Formerly the code assumed the arguments to be triples and threw an +error if this was not the case. But those arguments are only there for +compatibility with autotools and are not used within the build system, +so just dropping the code parsing these values makes the build system +more robust. + +Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de> +--- + configure | 32 ++------------------------------ + 1 files changed, 2 insertions(+), 30 deletions(-) + +diff --git a/configure b/configure +index 77203ed..ca30482 100755 +--- a/configure ++++ b/configure +@@ -171,37 +171,9 @@ for option; do + elif [ "${option}" = '--without-zsh-completion' ] ; then + WITH_ZSH=0 + elif [ "${option%%=*}" = '--build' ] ; then +- build_option="${option#*=}" +- case ${build_option} in +- *-*-*) ;; +- *) +- echo "Unrecognized value for --build option: ${build_option}" +- echo "Should be: --" +- echo "See:" +- echo " $0 --help" +- echo "" +- exit 1 +- esac +- build_cpu=${build_option%%-*} +- build_option=${build_option#*-} +- build_vendor=${build_option%%-*} +- build_os=${build_option#*-} ++ true + elif [ "${option%%=*}" = '--host' ] ; then +- host_option="${option#*=}" +- case ${host_option} in +- *-*-*) ;; +- *) +- echo "Unrecognized value for --host option: ${host_option}" +- echo "Should be: --" +- echo "See:" +- echo " $0 --help" +- echo "" +- exit 1 +- esac +- host_cpu=${host_option%%-*} +- host_option=${host_option#*-} +- host_vendor=${host_option%%-*} +- host_os=${host_option#*-} ++ true + elif [ "${option%%=*}" = '--infodir' ] ; then + true + elif [ "${option%%=*}" = '--datadir' ] ; then +-- +1.7.9.1 +