From patchwork Thu Oct 11 04:53:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Holsgrove X-Patchwork-Id: 190789 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 D1E7C2C0080 for ; Thu, 11 Oct 2012 15:54:51 +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=1350536092; 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=NBCokDXtd2/mfP2HBMFo2xGQwGQ=; b=Ek1QKT5utemjF6E Opq0sP9wdXn2LWe6oIo95hzDC1orGZHm2rq0+8NQZw8BagpDSgAfCUc6Lqc+cR9z vcKMdpZsCo2qeBIzPEuGgsFzusWWwKW5kTr1zT9U03xIuGH+XgDphFCRpTggybL1 57d0vUMNXcXfo9gQ4waNYRpgnHpA= 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=LEpBcoJqMhe4/4LY+eIa2gqMLNmXVzhAx0uJEedjVZrvd6Mi8ftEUml4W7WwOn 7eZXPN2s7781DRVXAagY7Md1fwt/IHAHVPx1BPH5lDnAbgvWNUWSXXd8yDiaJLxW 7Tc58+UwsIcTyy2Da1PgvhkRD0jVQiqit4V7QIe9Oa2vs=; Received: (qmail 2102 invoked by alias); 11 Oct 2012 04:53:58 -0000 Received: (qmail 2028 invoked by uid 22791); 11 Oct 2012 04:53:57 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, HK_OBFDOM, HK_OBFDOMREQ, 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:50 +0000 Received: by mail-pa0-f41.google.com with SMTP id fa10so1482167pad.0 for ; Wed, 10 Oct 2012 21:53:50 -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=1PIcnXWuJl7tlxbJNiQxPxH1O4O2xH6JOma9Sp+x0Hc=; b=mJYlXqme28ek/opkw2tpNfNUOp8+2vhLXrN+yCHsLZz26AvLoh1Bc4laPWErt41rBm 8pNO8HC07Im5tic9qryVj/g0tnfHF6chu4d9aEf1hbG6jSjplRoqA0/f/wTDe5zQ7G0j DdrPoNFSbA9Xn+wCEPFIHPtkTrNWFS0/2TGIwbaqUWiNIXD6GrRp7Bt7tBxplp104zd1 9Pcs0zdIZMW618kWPmCVT9JVicbfJ7B9jJOvSGP9R9jTHe4bvTe7oMobafRT1/DGZ95d qIt7B/3YzlvIL9OM3bdeG+q6gd4nOHoNvHJJ7sYPZKq5PvIU2sLyEn9KXpNqndQ7DSxK fgSA== Received: by 10.66.85.8 with SMTP id d8mr68715654paz.30.1349931230333; Wed, 10 Oct 2012 21:53:50 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id qd9sm2120460pbb.31.2012.10.10.21.53.48 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 21:53:49 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 07 of 13] binutils/elf2flt: Add CUSTOM version, CUSTOM_LOCATION config options, GetCustom X-Mercurial-Node: 288db3721a37844defa55bb6f588c8f7a1ac3dae Message-Id: <288db3721a37844defa5.1349931196@localhost.localdomain> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.3.1 Date: Thu, 11 Oct 2012 14:53:16 +1000 From: David Holsgrove To: yann.morin.1998@free.fr Cc: crossgcc@sourceware.org X-Gm-Message-State: ALoCoQmRwT7f0K3XRBf3efzrBhQHO3zsYL1rf6KU4l7bTyKsnLiMabr/js0yN8hDr7MtrZgsqOsp 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 1349930382 -36000 # Node ID 288db3721a37844defa55bb6f588c8f7a1ac3dae # Parent 7a604b5df9c84a1e20c3de3f04df0ed25bd491cb binutils/elf2flt: Add CUSTOM version, CUSTOM_LOCATION config options, GetCustom CUSTOM_LOCATION config options only presented in menuconfig if component CUSTOM version selected. Change elf2flt CT_ELF2FLT_VERSION from 'head' to 'cvs' if cvs selected in config Also remove hardcoded 'cvs-' from elf2flt component name, used in CT_Extract, CT_Patch and as the CT_SRC_DIR location for the configure stage. Signed-off-by: "David Holsgrove" --- For unsubscribe information see http://sourceware.org/lists.html#faq diff -r 7a604b5df9c8 -r 288db3721a37 config/binutils/elf2flt.in --- a/config/binutils/elf2flt.in Thu Oct 11 14:39:41 2012 +1000 +++ b/config/binutils/elf2flt.in Thu Oct 11 14:39:42 2012 +1000 @@ -20,8 +20,26 @@ bool prompt "CVS Snapshot" +config ELF2FLT_CUSTOM + bool + prompt "Custom elf2flt" + depends on EXPERIMENTAL + endchoice +if ELF2FLT_CUSTOM + +config ELF2FLT_CUSTOM_LOCATION + string + prompt "Full path to custom elf2flt source" + default "" + help + Enter the path to the directory (or tarball) of your source for elf2flt, + or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/elf2flt + +endif # ELF2FLT_CUSTOM +if ! ELF2FLT_CUSTOM + config ELF2FLT_CVS_SNAPSHOT_SPEC string depends on ELF2FLT_CVS_SNAPSHOT @@ -31,9 +49,12 @@ What you enter here will be passed verbatim to the cvs checkout command so be careful! +endif # ! ELF2FLT_CUSTOM + config ELF2FLT_VERSION string - default "head" if ELF2FLT_CVSHEAD + default "cvs" if ELF2FLT_CVSHEAD + default "custom" if ELF2FLT_CUSTOM # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW diff -r 7a604b5df9c8 -r 288db3721a37 scripts/build/binutils/elf2flt.sh --- a/scripts/build/binutils/elf2flt.sh Thu Oct 11 14:39:41 2012 +1000 +++ b/scripts/build/binutils/elf2flt.sh Thu Oct 11 14:39:42 2012 +1000 @@ -13,17 +13,25 @@ # Download elf2flt do_elf2flt_get() { - CT_GetCVS "elf2flt-cvs-${CT_ELF2FLT_VERSION}" \ - ":pserver:anonymous@cvs.uclinux.org:/var/cvs" \ - "elf2flt" \ - "" \ - "elf2flt-cvs-${CT_ELF2FLT_VERSION}" + if [ "${CT_ELF2FLT_CUSTOM}" = "y" ]; then + CT_GetCustom "elf2flt" "${ELF2FLT_VERSION}" \ + "${CT_ELF2FLT_CUSTOM_LOCATION}" + else + CT_GetCVS "elf2flt-${CT_ELF2FLT_VERSION}" \ + ":pserver:anonymous@cvs.uclinux.org:/var/cvs" \ + "elf2flt" \ + "" \ + "elf2flt-${CT_ELF2FLT_VERSION}" + fi } # Extract elf2flt do_elf2flt_extract() { - CT_Extract "elf2flt-cvs-${CT_ELF2FLT_VERSION}" - CT_Patch "elf2flt-cvs" "${CT_ELF2FLT_VERSION}" + if [ "${CT_ELF2FLT_CUSTOM}" != "y" \ + -o ! -d "${CT_SRC_DIR}/elf2flt-${CT_ELF2FLT_VERSION}" ]; then + CT_Extract "elf2flt-${CT_ELF2FLT_VERSION}" + fi + CT_Patch "elf2flt" "${CT_ELF2FLT_VERSION}" } # Build elf2flt for build -> target @@ -111,7 +119,7 @@ CT_DoLog EXTRA "Configuring elf2flt" CT_DoExecLog CFG \ CFLAGS="${host_cflags}" \ - "${CT_SRC_DIR}/elf2flt-cvs-${CT_ELF2FLT_VERSION}/configure" \ + "${CT_SRC_DIR}/elf2flt-${CT_ELF2FLT_VERSION}/configure" \ --build=${CT_BUILD} \ --host=${host} \ --target=${CT_TARGET} \