From patchwork Wed Oct 10 06:07:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Holsgrove X-Patchwork-Id: 190554 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 4CA122C0084 for ; Wed, 10 Oct 2012 17:09:13 +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=1350454153; 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=ca6LhYtnUhm7GNvUslu+6py5E3g=; b=edH3l37Zac+G0cg xT9rsDCv5tLUAqKTgMCFO/FW5i218H6hZrioJMvH3dPVLibR5MbbbiDq2jc9wb5V h0KlikZJqhOHmk8ywMFIdfaP0xmvR4rpdWEsgUr3OGXFiodpkkhv4mUjc69RXmKN BQw0NY5JJO1SMQpVvmhuCRrj7zgY= 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=jIRo2/4lpycPnCANu4qAt3vtcVYnEyYQnBC0qhLAgOY68oznS2VqyTW6Vagcl8 mnpk6IVaRnpaHFzEpDahx3bgwK6bJGcXEOZNzghybu7++UaEbMv7YAodwpF2BEWN k2uOPH7+jv/yq8PoxcslvymNE7U6lc9dg+gtsJelNQmjs=; Received: (qmail 15680 invoked by alias); 10 Oct 2012 06:08:38 -0000 Received: (qmail 15606 invoked by uid 22791); 10 Oct 2012 06:08:34 -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 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:26 +0000 Received: by mail-pb0-f41.google.com with SMTP id rq2so391958pbb.0 for ; Tue, 09 Oct 2012 23:08:26 -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=jCRMGKLD04p9TtH3ThzmMMl8aYKKYdq+CC1p+69SPMA=; b=LOw71AWGL0CF4KP9Qntw4wBJsBNexwhvd1sSffLR4U1z1iqtiBRqwEiHM7/pe6HXrI I9h5nJOVKm0bWoDhIi173ThrtrdjHDbflSpBfKnrpewaEBRv64zNMcTNabr1CuOpuNFi UKZZeyRPCC/eLqmP6uev9gsOp4gmSMy/SjdDSFcUooa6LEwi57jF2xrI9RIPidOuj05s 3icssIe1BdpBvBRFQHv0/CE9jYHRtiYUobE3GwwDzZe/3AoIgKWMMRLkzTaOA/NGJ8Zx H58tA52Ktu3kxr9we9jNbtkTLShLlMmCpSm4787FerYF990ivgLyujsa0X1hs0ijvSfN LtJg== Received: by 10.68.135.196 with SMTP id pu4mr70906063pbb.11.1349849305930; Tue, 09 Oct 2012 23:08:25 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id bp7sm330177pab.33.2012.10.09.23.08.23 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Oct 2012 23:08:25 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 5 of 6] binutils: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom X-Mercurial-Node: 53e0ec83f0eb86286025821388cbdb82a8510941 Message-Id: <53e0ec83f0eb86286025.1349849278@localhost.localdomain> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.3.1 Date: Wed, 10 Oct 2012 16:07:58 +1000 From: David Holsgrove To: bryanhundven@gmail.com, yann.morin.1998@free.fr Cc: crossgcc@sourceware.org X-Gm-Message-State: ALoCoQmoTjmLZLVdzdbWhCCDEkhgttULeJN/BbPRNfkqBk+7rqF8bmew7YYi5YxoePQNx4LvrZKZ 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 1349847855 -36000 # Node ID 53e0ec83f0eb86286025821388cbdb82a8510941 # Parent e3e4a439914d0d206b08a7bed0245fc4854bc374 binutils: 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 e3e4a439914d -r 53e0ec83f0eb config/binutils/binutils.in --- a/config/binutils/binutils.in Wed Oct 10 15:44:14 2012 +1000 +++ b/config/binutils/binutils.in Wed Oct 10 15:44:15 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 e3e4a439914d -r 53e0ec83f0eb scripts/build/binutils/binutils.sh --- a/scripts/build/binutils/binutils.sh Wed Oct 10 15:44:14 2012 +1000 +++ b/scripts/build/binutils/binutils.sh Wed Oct 10 15:44:15 2012 +1000 @@ -4,14 +4,26 @@ # 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_TestAndAbort "Custom binutils: CT_CUSTOM_LOCATION_ROOT_DIR or CT_BINUTILS_CUSTOM_LOCATION must be set." \ + -z "${CT_CUSTOM_LOCATION_ROOT_DIR}" -a -z "${CT_BINUTILS_CUSTOM_LOCATION}" + if [ -n "${CT_CUSTOM_LOCATION_ROOT_DIR}" -a -z "${CT_BINUTILS_CUSTOM_LOCATION}" ]; then + CT_BINUTILS_CUSTOM_LOCATION="${CT_CUSTOM_LOCATION_ROOT_DIR}/binutils" + fi + 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_BINUTILS_CUSTOM_LOCATION}" ]; then + CT_Extract "binutils-${CT_BINUTILS_VERSION}" + fi CT_Patch "binutils" "${CT_BINUTILS_VERSION}" }