From patchwork Thu Oct 11 04:53:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Holsgrove X-Patchwork-Id: 190788 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 2D1992C0080 for ; Thu, 11 Oct 2012 15:54:41 +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=1350536082; 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=JLeHrkJlqpA4ujYczOIiFEmePXo=; b=fnk5zDu0sXHr+jr NNk1M8Ro7Hkk6C18oQlvfQGpNgk2c84Qw+CD4aQI9/+3aHXi9Zem6h7CbdQIFNa3 wWV+D8FBf3sUvoWO75e+d/FNGa57+sLi+C/FJPF9Q9w12H7ptcBkypHrd/rA8w23 7xWcSt7zTSs9RBGhjHgMtR2Io0oI= 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=Uo1Fo1+fadHlXUrgvR7BlkxSdT1uAq01TBvaN42kEozZI9v3rsUJrng4e0J3kb rKSa6T4iYmCvMNTjssdLTExCTsSokTsWk2cTPtIOAQLrjrS1DIs02LC2wtOKyncj Z8HR1PkObf3cwsV/dD2eXsjoa+6avKG8W5lYX/0XMb5/I=; Received: (qmail 1667 invoked by alias); 11 Oct 2012 04:53:52 -0000 Received: (qmail 1635 invoked by uid 22791); 11 Oct 2012 04:53:50 -0000 X-SWARE-Spam-Status: No, hits=-3.3 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE 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:45 +0000 Received: by mail-pa0-f41.google.com with SMTP id fa10so1482238pad.0 for ; Wed, 10 Oct 2012 21:53:45 -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=rkbnD+PzbWYIQtSKyJm/psFhS3ycmnWRfyU0E25nAM8=; b=fNtNTmvF96K2QpGrLErmuqkIxqXnTYpXKukCW7WP+Fmd+gnd7wRPiT6hA+3R+ESuSX qmz57v2TPDdyPcHW/33TEwT9jS8P0VDZ6IRjSIMQeie28DS3lHMurmtdIpgQ6VuLWYw4 OibieTl+BttuDleHzTHbDoJGHtF+Fek9GUyGDTWs77k4r5v5HSF37/1jva5A8l47hteT gBYjS92l9qF/C72dpxjokDJEm3MkZOEziDi1TTx+Q4TSqTP2PzOs2VxEJUcKye1ONjXU mTZ7W+v1e/iB6zIwfITUFaeF1lTmeD0lXxhuLxI8tHlTINEDlZryfY4Yz+724IFYLrMb E21w== Received: by 10.68.248.33 with SMTP id yj1mr14554586pbc.141.1349931225213; Wed, 10 Oct 2012 21:53:45 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id j10sm1977279pax.4.2012.10.10.21.53.43 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 21:53:44 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 06 of 13] binutils/binutils: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom X-Mercurial-Node: 7a604b5df9c84a1e20c3de3f04df0ed25bd491cb Message-Id: <7a604b5df9c84a1e20c3.1349931195@localhost.localdomain> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.3.1 Date: Thu, 11 Oct 2012 14:53:15 +1000 From: David Holsgrove To: yann.morin.1998@free.fr Cc: crossgcc@sourceware.org X-Gm-Message-State: ALoCoQk3oSMvHz2Do5cwlhuBFCC32hT5UtqcFHZGeRSu2ecVO6naT+96WevWE8TYjsaTslp21aw2 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 7a604b5df9c84a1e20c3de3f04df0ed25bd491cb # Parent f2272ac0f37cedd0bb91346d57681599758ea988 binutils/binutils: 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 f2272ac0f37c -r 7a604b5df9c8 config/binutils/binutils.in --- a/config/binutils/binutils.in Thu Oct 11 14:39:41 2012 +1000 +++ b/config/binutils/binutils.in Thu Oct 11 14:39:41 2012 +1000 @@ -50,8 +50,26 @@ prompt "2.16.1a (OBSOLETE)" depends on OBSOLETE +config BINUTILS_CUSTOM + bool + prompt "Custom binutils" + depends on EXPERIMENTAL + select BINUTILS_2_22_or_later + endchoice +if BINUTILS_CUSTOM + +config BINUTILS_CUSTOM_LOCATION + string + prompt "Full path to custom binutils source" + default "" + help + Enter the path to the directory (or tarball) of your source for binutils, + or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/binutils + +endif # BINUTILS_CUSTOM + config BINUTILS_VERSION string # Don't remove next line @@ -64,6 +82,7 @@ default "2.18a" if BINUTILS_V_2_18a default "2.17a" if BINUTILS_V_2_17a default "2.16.1a" if BINUTILS_V_2_16_1a + default "custom" if BINUTILS_CUSTOM config BINUTILS_2_22_or_later bool diff -r f2272ac0f37c -r 7a604b5df9c8 scripts/build/binutils/binutils.sh --- a/scripts/build/binutils/binutils.sh Thu Oct 11 14:39:41 2012 +1000 +++ b/scripts/build/binutils/binutils.sh Thu Oct 11 14:39:41 2012 +1000 @@ -4,14 +4,22 @@ # Download binutils do_binutils_get() { - CT_GetFile "binutils-${CT_BINUTILS_VERSION}" \ - {ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils \ - ftp://gcc.gnu.org/pub/binutils/{releases,snapshots} + if [ "${CT_BINUTILS_CUSTOM}" = "y" ]; then + CT_GetCustom "binutils" "${CT_BINUTILS_VERSION}" \ + "${CT_BINUTILS_CUSTOM_LOCATION}" + else + CT_GetFile "binutils-${CT_BINUTILS_VERSION}" \ + {ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils \ + ftp://gcc.gnu.org/pub/binutils/{releases,snapshots} + fi } # Extract binutils do_binutils_extract() { - CT_Extract "binutils-${CT_BINUTILS_VERSION}" + if [ "${CT_BINUTILS_CUSTOM}" != "y" \ + -o ! -d "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}" ]; then + CT_Extract "binutils-${CT_BINUTILS_VERSION}" + fi CT_Patch "binutils" "${CT_BINUTILS_VERSION}" }