From patchwork Wed Oct 10 06:07:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Holsgrove X-Patchwork-Id: 190552 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 56C632C0081 for ; Wed, 10 Oct 2012 17:08:50 +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=1350454130; 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=KV/ayvmOBCM1F9SvKL+FiPm2Ob8=; b=rAUXooQx7mT5qZ9 4IZEQD/AACkOot9JFzMjlvbq2rO4MgsUYGmB6AyDF6bLRD/rP0RpC8b+A3L4+jfi e7/3x7y355oy62+3vgEWgoPO3QnR/+6prlxLdPxajrwA/FDYHkpqQQfhwoQmjXIW e2Xl2U4TgJ53YYBHFlZxD44dIQ6U= 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=Qu+7HtKRBE38VznEI2m13FYfqmyl8TRswNYDy2iyJ4nB5FZot25E6Wo3RfU78i nn8MKEEkNe0flvjTWfJUmfwlHWe1BaIDf/gWnADSkS+1XOEa4MB6KYDUlsg0ZJ8n fG7arD+ZXiOXMR5vLF8KO32zYECLQ/jTFVXEa44KgnHss=; Received: (qmail 15047 invoked by alias); 10 Oct 2012 06:08:25 -0000 Received: (qmail 14948 invoked by uid 22791); 10 Oct 2012 06:08:23 -0000 X-SWARE-Spam-Status: No, hits=-3.1 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-pb0-f41.google.com (HELO mail-pb0-f41.google.com) (209.85.160.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 10 Oct 2012 06:08:15 +0000 Received: by mail-pb0-f41.google.com with SMTP id rq2so391958pbb.0 for ; Tue, 09 Oct 2012 23:08:14 -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=c+rF82N8VfbQl6YhJiywdECdshTjsYIMpl55kNcQXpg=; b=RkmKVsZAVk28fNhhgHqqJE4iii1uhRK6wG01NB2XAoegP8RLah2T2qzOychLqYk6h+ MA4TUFuLJ8xRLspJHHMlQxZPFBtoMjfzBPos+VzxW1/BH4uI9h5Xe9nucjj3XuvQ+fmw NJOWMVFvPDxTWwWDmZI3MkxK8zIPsAs593ULVrnztevsk7Uq4/Bx/T0KG0QuvmSDf3yh qlzjDAMYQ7GgAXG4hxcUeF5/BYPMmW9yqdxmVeWSwSTTrN1xuJZomf9C8l8WCjNqpfq5 9qKFXbt2RlUandlRFOFzKBYwqfBVpKBK/unKuegcTFB5mWCnJ/dM6e2tjhQLq31IYf03 JbIg== Received: by 10.66.79.166 with SMTP id k6mr59454228pax.25.1349849294799; Tue, 09 Oct 2012 23:08:14 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id l6sm339304pav.12.2012.10.09.23.08.12 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Oct 2012 23:08:14 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 3 of 6] cc/gcc: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom X-Mercurial-Node: 7748cfa416638a6d2b808628f6e9a84ed37a89e5 Message-Id: <7748cfa416638a6d2b80.1349849276@localhost.localdomain> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.3.1 Date: Wed, 10 Oct 2012 16:07:56 +1000 From: David Holsgrove To: bryanhundven@gmail.com, yann.morin.1998@free.fr Cc: crossgcc@sourceware.org X-Gm-Message-State: ALoCoQm1VDYI0J6K5Tcb1GXTO77USmLkkr6+4jXo9fFJ71kgNKSZUOevEKMrlaySUj2NiDLkBe6W 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 1349847854 -36000 # Node ID 7748cfa416638a6d2b808628f6e9a84ed37a89e5 # Parent b6b1b07f7ab14184f457e907db6269057cdd6126 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. --- For unsubscribe information see http://sourceware.org/lists.html#faq diff -r b6b1b07f7ab1 -r 7748cfa41663 config/cc/gcc.in --- a/config/cc/gcc.in Wed Oct 10 15:44:13 2012 +1000 +++ b/config/cc/gcc.in Wed Oct 10 15:44:14 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 b6b1b07f7ab1 -r 7748cfa41663 scripts/build/cc/gcc.sh --- a/scripts/build/cc/gcc.sh Wed Oct 10 15:44:13 2012 +1000 +++ b/scripts/build/cc/gcc.sh Wed Oct 10 15:44:14 2012 +1000 @@ -4,7 +4,14 @@ # Download gcc do_cc_get() { - if [ -n "${CT_CC_V_SVN}" ]; then + if [ "${CT_CC_CUSTOM}" = "y" ]; then + CT_TestAndAbort "Custom gcc: CT_CUSTOM_LOCATION_ROOT_DIR or CT_CC_CUSTOM_LOCATION must be set." \ + -z "${CT_CUSTOM_LOCATION_ROOT_DIR}" -a -z "${CT_CC_CUSTOM_LOCATION}" + if [ -n "${CT_CUSTOM_LOCATION_ROOT_DIR}" -a -z "${CT_CC_CUSTOM_LOCATION}" ]; then + CT_CC_CUSTOM_LOCATION="${CT_CUSTOM_LOCATION_ROOT_DIR}/gcc" + fi + 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 +66,10 @@ # Extract gcc do_cc_extract() { - CT_Extract "gcc-${CT_CC_VERSION}" + if [ "${CT_CC_CUSTOM}" != "y" \ + -o ! -d "${CT_CC_CUSTOM_LOCATION}" ]; 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