From patchwork Thu Oct 11 04:53:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Holsgrove X-Patchwork-Id: 190793 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 D925B2C008B for ; Thu, 11 Oct 2012 15:55:38 +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=1350536139; 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=L0C5zK2WaF7xn519i+7WFbcvGQc=; b=Tt10I+lo2WafA1b 2a+Kq5bc2AWB0uojZTKtsFYPRF+Fs/aXgJjoJfBHN+bOlE//vSS1AJyUKSscksp0 GXCvQXJn3hynI4u+7EeIXapA7ZX7JIftaLAyfWyHgQbUM58pDeyQJMiXD11xZ+BA caZof42aL8EBfsOrimsm931F5fmo= 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=cf063GJrLtb+/K4RkobZvnoXKaG1caQ5bDuJUjImZVrJGbQtFN018+0og0qY6j N+NgM/vRR8ODeyThr0NCfezf3+kpvJIy99d8QSG4h4nP1VtnztuRcgW3GekXuPto AnqXmGsp/HX0TqRtbMhN/WtaZ7BhI8e0diJcVa4JM/tao=; Received: (qmail 3169 invoked by alias); 11 Oct 2012 04:54:20 -0000 Received: (qmail 3017 invoked by uid 22791); 11 Oct 2012 04:54:17 -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-da0-f41.google.com (HELO mail-da0-f41.google.com) (209.85.210.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 11 Oct 2012 04:54:11 +0000 Received: by mail-da0-f41.google.com with SMTP id i14so603967dad.0 for ; Wed, 10 Oct 2012 21:54:10 -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=m8rL4tkVpvIspBJ1w4pQ1MerGJ+oCK2GTT5DoGqXleo=; b=lr6PDWEPA8UARvZDACQuI9D8QzUSILfyI4JpAtjmzuGR/9u1WxfoAuJx21RWHLkXQJ DFaQtyhECO/UX9XTrN+A0LAVrRxEPvYhZLXOqLhVEB53fAuL4KkL+cJ8se11J8i430UA lAGsgFVylQ8YFFZuBwTEI01XyjlxzallEnXg+j8er2yjKQSyQAcb8I4jDNf2DU1J6U4d pzgdrIE2OP6ZH9JFriq3t2OaxVNoMb79JLCiWVm1ke3ABXrPuO+u2xnlbP01QHgZNe1B b1OnQ/VLXI5bVcH+arhyDmlWgyuEo315J9mMtrGbsJ1ooa1HV30zYjAd0M+8z8DprV49 ZzNw== Received: by 10.66.75.233 with SMTP id f9mr68439870paw.21.1349931250671; Wed, 10 Oct 2012 21:54:10 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id pi1sm2125814pbb.7.2012.10.10.21.54.08 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 21:54:10 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 11 of 13] libc/eglibc: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom X-Mercurial-Node: ad791eab5e898b88dac15629f7b1db9915b3385a Message-Id: In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.3.1 Date: Thu, 11 Oct 2012 14:53:20 +1000 From: David Holsgrove To: yann.morin.1998@free.fr Cc: crossgcc@sourceware.org X-Gm-Message-State: ALoCoQnB+V2n7116CudIe2ekMz+8jX5E5JdD7hjo9rfP/ysCyLvix8wxUNPDKxwcVlNY78nY1znh 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 1349930383 -36000 # Node ID ad791eab5e898b88dac15629f7b1db9915b3385a # Parent 2a9fea5e593095a51ee01fda28b972cb569f6cf4 libc/eglibc: 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 2a9fea5e5930 -r ad791eab5e89 config/libc/eglibc.in --- a/config/libc/eglibc.in Thu Oct 11 14:39:43 2012 +1000 +++ b/config/libc/eglibc.in Thu Oct 11 14:39:43 2012 +1000 @@ -85,6 +85,13 @@ help Selecting this will export the trunk of the eglibc subversion repository. +config LIBC_EGLIBC_CUSTOM + bool + prompt "Custom eglibc" + depends on EXPERIMENTAL + select LIBC_EGLIBC_2_16_or_later + select LIBC_CUSTOM + endchoice config LIBC_VERSION @@ -104,6 +111,7 @@ default "2_6" if LIBC_EGLIBC_V_2_6 default "2_5" if LIBC_EGLIBC_V_2_5 default "trunk" if LIBC_EGLIBC_V_TRUNK + default "custom" if LIBC_EGLIBC_CUSTOM config LIBC_EGLIBC_2_16_or_later bool @@ -140,6 +148,22 @@ config LIBC_EGLIBC_HAS_PKGVERSION_BUGURL bool +config LIBC_CUSTOM + bool + +if LIBC_EGLIBC_CUSTOM + +config LIBC_EGLIBC_CUSTOM_LOCATION + string + prompt "Full path to custom eglibc source" + default "" + help + Enter the path to the directory (or tarball) of your source for eglibc, + or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/eglibc + +endif # LIBC_EGLIBC_CUSTOM +if ! LIBC_EGLIBC_CUSTOM + if CONFIGURE_has_svn config EGLIBC_REVISION @@ -189,6 +213,7 @@ comment "otherwise you won't be able to download eglibc" endif # ! CONFIGURE_has_svn +endif # ! LIBC_EGLIBC_CUSTOM config EGLIBC_OPT_SIZE bool diff -r 2a9fea5e5930 -r ad791eab5e89 scripts/build/libc/eglibc.sh --- a/scripts/build/libc/eglibc.sh Thu Oct 11 14:39:43 2012 +1000 +++ b/scripts/build/libc/eglibc.sh Thu Oct 11 14:39:43 2012 +1000 @@ -28,9 +28,14 @@ *) svn_base+="/branches/eglibc-${CT_LIBC_VERSION}";; esac - CT_GetSVN "eglibc-${CT_LIBC_VERSION}" \ - "${svn_base}/libc" \ - "${CT_EGLIBC_REVISION:-HEAD}" + if [ "${CT_LIBC_CUSTOM}" = "y" ]; then + CT_GetCustom "eglibc" "${CT_LIBC_VERSION}" "${CT_LIBC_CUSTOM_LOCATION}" + CT_LIBC_CUSTOM_LOCATION="${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}" + else + CT_GetSVN "eglibc-${CT_LIBC_VERSION}" \ + "${svn_base}/libc" \ + "${CT_EGLIBC_REVISION:-HEAD}" + fi if [ "${CT_LIBC_LOCALES}" = "y" ]; then extra_addons+=("localedef")