From patchwork Thu Oct 11 04:53:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Holsgrove X-Patchwork-Id: 190787 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 1CD732C0080 for ; Thu, 11 Oct 2012 15:54:34 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=sourceware.org; s=default; x=1350536075; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Content-Type:MIME-Version:Content-Transfer-Encoding: Subject:Message-Id:In-Reply-To:References:User-Agent:Date:From: To:Cc:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Subscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=tDcGuHb1xmUhpcC2sqSQcjJ9kcU=; b=NORx0jtCXGGtw+l ugpW8ToULFYwNImsNL3m/XcF9XsKXlo+cRFng4XvY41QO26W9q8LxLBRNWhBmtVY UWX8CuDKDDmBDaR7y1PyYkxBEyqVoC+kU1HRm9BcDZAqD6LLXZUXjqeTjVg9nvSW Vtpd2ZfGCa1qOFUNqxKeVln6gO/k= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=sourceware.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:X-Google-DKIM-Signature:Received:Received:Content-Type:MIME-Version:Content-Transfer-Encoding:Subject:X-Mercurial-Node:Message-Id:In-Reply-To:References:User-Agent:Date:From:To:Cc:X-Gm-Message-State:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Subscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=YbXbNChkRlj9QpSG8uAdtiV/40OTBMbd56RrsrFUPPZdvaCOi+t6x6KAmDeNxN MwNQnCLCK2G1UzX6UQiEKEA/bJRrqt7QlA9WPo/hXkh0TWddLbHyT1O1ak2D82wK c0mrGGWYgWjnFhcdKuYpE6JCsd0K/57Xk8a0B2q/0gYr8=; Received: (qmail 1549 invoked by alias); 11 Oct 2012 04:53:50 -0000 Received: (qmail 1482 invoked by uid 22791); 11 Oct 2012 04:53:48 -0000 X-SWARE-Spam-Status: No, hits=-3.2 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, TW_SV X-Spam-Check-By: sourceware.org Received: from mail-pa0-f41.google.com (HELO mail-pa0-f41.google.com) (209.85.220.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 11 Oct 2012 04:53:40 +0000 Received: by mail-pa0-f41.google.com with SMTP id fa10so1482167pad.0 for ; Wed, 10 Oct 2012 21:53:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:content-type:mime-version:content-transfer-encoding:subject :x-mercurial-node:message-id:in-reply-to:references:user-agent:date :from:to:cc:x-gm-message-state; bh=TojJ5Qq8rV1hb6cf+sgtQ+Zjk2l0T4yCaPXkB2OeN/c=; b=PHnaXt/sXK3FxpdFC1ke7ywlsC38ezhKCzma9XdHhB8bpQ0lLnINGreJBe/AoeykYy IH7zKDSdFIrXi/6S4AXfpzJhiccRULqdZhvrmD6PID4FA2lEm/HxREtzpXSgT4FRBUVE nQiPZd8oGCl7p2WMUgVG4htRXFaJkD4pWDGr7aK/t929xHgc2fLOkoyU0Rm3l1eMh9HR 0nfsa5+0ffctWNzvhUOoSjiDrsN7DAgr3OEfGhmBYyNiwpiQQmm7AdYFjz2ntW2JzG74 x7oTblFf5cBdoD3yCynEkP33mAt++XN1prNtahEBxQAxXYGQjpOPZU/zMldH7+JuOVq+ 67ng== Received: by 10.66.79.133 with SMTP id j5mr20057451pax.51.1349931220118; Wed, 10 Oct 2012 21:53:40 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id ky6sm2122930pbc.18.2012.10.10.21.53.38 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 21:53:39 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 05 of 13] cc/gcc: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom X-Mercurial-Node: f2272ac0f37cedd0bb91346d57681599758ea988 Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.3.1 Date: Thu, 11 Oct 2012 14:53:14 +1000 From: David Holsgrove To: yann.morin.1998@free.fr Cc: crossgcc@sourceware.org X-Gm-Message-State: ALoCoQlqljh6gDxYMbTDs5T9bvMhKFmqjIRcbxqTjH5rF54T+WQZojWbfTPCC7WAIYj88EaZ5jnH X-IsSubscribed: yes Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org Delivered-To: mailing list crossgcc@sourceware.org # HG changeset patch # User David Holsgrove # Date 1349930381 -36000 # Node ID f2272ac0f37cedd0bb91346d57681599758ea988 # Parent 50674fe47431174aab80d6c01460aa2d6c901306 cc/gcc: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom CUSTOM_LOCATION config options only presented in menuconfig if component CUSTOM version selected. Signed-off-by: "David Holsgrove" --- For unsubscribe information see http://sourceware.org/lists.html#faq diff -r 50674fe47431 -r f2272ac0f37c config/cc/gcc.in --- a/config/cc/gcc.in Thu Oct 11 14:39:40 2012 +1000 +++ b/config/cc/gcc.in Thu Oct 11 14:39:41 2012 +1000 @@ -239,6 +239,12 @@ prompt "3.4.6 (OBSOLETE)" depends on OBSOLETE +config CC_CUSTOM + bool + prompt "Custom gcc" + depends on EXPERIMENTAL + select CC_GCC_latest + endchoice if CC_V_SVN @@ -297,6 +303,18 @@ endif +if CC_CUSTOM + +config CC_CUSTOM_LOCATION + string + prompt "Full path to custom gcc source" + default "" + help + Enter the path to the directory (or tarball) of your source for gcc, + or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/gcc + +endif #CC_CUSTOM + config CC_GCC_4_2 bool select CC_GCC_4_2_or_later @@ -484,6 +502,7 @@ default "4.1.2" if CC_V_4_1_2 default "4.0.4" if CC_V_4_0_4 default "3.4.6" if CC_V_3_4_6 + default "custom" if CC_CUSTOM config CC_LANG_JAVA_USE_ECJ bool diff -r 50674fe47431 -r f2272ac0f37c scripts/build/cc/gcc.sh --- a/scripts/build/cc/gcc.sh Thu Oct 11 14:39:40 2012 +1000 +++ b/scripts/build/cc/gcc.sh Thu Oct 11 14:39:41 2012 +1000 @@ -4,7 +4,9 @@ # Download gcc do_cc_get() { - if [ -n "${CT_CC_V_SVN}" ]; then + if [ "${CT_CC_CUSTOM}" = "y" ]; then + CT_GetCustom "gcc" "${CT_CC_VERSION}" "${CT_CC_CUSTOM_LOCATION}" + elif [ -n "${CT_CC_V_SVN}" ]; then # Get gcc from SVN! local svn_base @@ -59,7 +61,10 @@ # Extract gcc do_cc_extract() { - CT_Extract "gcc-${CT_CC_VERSION}" + if [ "${CT_CC_CUSTOM}" != "y" \ + -o ! -d "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}" ]; then + CT_Extract "gcc-${CT_CC_VERSION}" + fi CT_Patch "gcc" "${CT_CC_VERSION}" # Copy ecj-latest.jar to ecj.jar at the top of the GCC source tree