From patchwork Mon Oct 29 23:39:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 195172 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 494112C009F for ; Tue, 30 Oct 2012 10:47:55 +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=1352159275; h=Comment: DomainKey-Signature: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=ujn0Gf0 L2J8ibi+iMt5V2LmjEXY=; b=F1Ye+EvfYeYVc7LW/eBbKfwQ+7SvFRwtxA72+/s lJi7nJrL+bThqKUQlddik1EXQrgxptTHVpczWI+E1Au26/9BZQNISC/pGa7v1IJ/ HiZ2RBOT2T2Hgxlwj2XM+6sb0XFFCYxP0J426ABkpgyLFEBV6ZH79R1GiKtuRhZG F47I= 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:Content-Type:MIME-Version:Content-Transfer-Encoding:Subject:X-Mercurial-Node:Message-Id:In-Reply-To:References:User-Agent:Date:From:To:Cc:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Subscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=rv5hh/4/y9X+IO7Szi7kOa12aEhKBP/NyFZKK7Jydu8gppEI31OVviXc+GmpIL b0XkXS2TtNTQsvpqUB+SHKWy3lvJVjcT05HR6xawkE2AviER7GGub1ZliTSypRNH 24GO/Rn2mYIaB2Q+Pmz8WjkHPybMYQ1B+JaQNGlzTblmE=; Received: (qmail 32476 invoked by alias); 29 Oct 2012 23:47:45 -0000 Received: (qmail 32455 invoked by uid 22791); 29 Oct 2012 23:47:44 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, KHOP_THREADED, RCVD_IN_DNSWL_NONE, RCVD_IN_HOSTKARMA_NO, TW_SV X-Spam-Check-By: sourceware.org Received: from smtp01.smtpout.orange.fr (HELO smtp.smtpout.orange.fr) (80.12.242.123) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 29 Oct 2012 23:47:39 +0000 Received: from treguer.bzh.lan ([90.32.154.3]) by mwinf5d02 with ME id HBnc1k00804fmnu03BndRz; Tue, 30 Oct 2012 00:47:37 +0100 MIME-Version: 1.0 Subject: [PATCH 1 of 1] cc/gcc: remove svn source X-Mercurial-Node: f5af323f7805a54741de4e4495b94a6fc6eb371c Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.0 Date: Tue, 30 Oct 2012 00:39:18 +0100 From: "Yann E. MORIN" To: Bryan Hundven Cc: crossgcc@sourceware.org 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 "Yann E. MORIN" # Date 1351553447 -3600 # Node ID f5af323f7805a54741de4e4495b94a6fc6eb371c # Parent 9f6e46b6dc4245f653f5818d2fbb4b7e75da1aba cc/gcc: remove svn source Since we now have the opportunity to use a custom local directory/tarball as the source for gcc, it no longer makes sense to retrieve gcc ourselves from its subversion repository. Cc: Bryan Hundven Signed-off-by: "Yann E. MORIN" --- For unsubscribe information see http://sourceware.org/lists.html#faq diff --git a/config/cc/gcc.in b/config/cc/gcc.in --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -34,13 +34,6 @@ bool prompt "gcc version" -config CC_V_SVN - bool - prompt "gcc from svn" - depends on EXPERIMENTAL - depends on CONFIGURE_has_svn - select CC_GCC_latest - # Don't remove next line # CT_INSERT_VERSION_BELOW @@ -247,62 +240,6 @@ endchoice -if CC_V_SVN - -config GCC_BRANCH - string - prompt "Branch or tag to use" - default "trunk" - help - Enter the branch of gcc to use. Default is trunk - - A few examples might be: - * trunk - * branches/gcc-4_7-branch - * branches/gcc-4_4-branch - * branches/gccgo - * branches/google - * tags/gcc_4_7_1_release - * tags/microblaze-4.4.2 - -config GCC_REVISION - string - prompt "Revision to use" - default "HEAD" - help - Enter the revision of you want to use. Default is HEAD - - A revision argument can be one of: - NUMBER revision number - '{' DATE '}' revision at start of the date (*) - 'HEAD' latest in repository - - (*) If you want to use a date, please use ISO-8601 formats if - at all possible. - -config GCC_HTTP - bool - prompt "use http:// instead of svn://" - help - By default, when gcc is downloaded it is checked out using - svn://gcc.gnu.org/svn/gcc. This option allows you to download gcc - from http://gcc.gnu.org/svn/gcc, if you are behind a proxy or firewall. - If you are behind a proxy, don't forget to update your - .subversion/servers file with your proxy info in [global]. - -config GCC_CHECKOUT - bool - prompt "checkout instead of export" - help - By default, the gcc download will be an export of the subversion - repository. If you say 'y' here, then the repository will instead be - checked-out, so that you can update it later. - - Note that crosstool-NG will *not* update your working copy, you will - have to do that yourself. - -endif - if CC_CUSTOM config CC_CUSTOM_LOCATION @@ -461,7 +398,6 @@ config CC_VERSION string - default "SVN" if CC_V_SVN # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW default "linaro-4.7-2012.10" if CC_V_linaro_4_7_2012_10 diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -4,31 +4,13 @@ # Download gcc do_cc_get() { + local linaro_version + local linaro_series + local linaro_base_url="http://launchpad.net/gcc-linaro" + 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 - - if [ "${CT_GCC_HTTP}" = "y" ]; then - svn_base="http://gcc.gnu.org/svn/gcc" - else - svn_base="svn://gcc.gnu.org/svn/gcc" - fi - - svn_base+="/${CT_GCC_BRANCH:-trunk}" - - CT_CC_VERSION="${CT_GCC_BRANCH//\//_}" - - CT_GetSVN "gcc-${CT_CC_VERSION}" \ - "${svn_base}/" \ - "${CT_GCC_REVISION:-HEAD}" else - local linaro_version - local linaro_series - local linaro_base_url="http://launchpad.net/gcc-linaro" - - # Account for the Linaro versioning linaro_version="$( echo "${CT_CC_VERSION}" \ |sed -r -e 's/^linaro-//;' \ @@ -48,7 +30,7 @@ ftp://ftp.uvsq.fr/pub/gcc/snapshots/${CT_CC_VERSION} \ "${linaro_base_url}/${linaro_series}/${linaro_version}/+download" - fi # -n ${CT_CC_V_SVN} + fi # ! custom location # Starting with GCC 4.3, ecj is used for Java, and will only be # built if the configure script finds ecj.jar at the top of the # GCC source tree, which will not be there unless we get it and