From patchwork Thu Oct 11 04:53:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Holsgrove X-Patchwork-Id: 190792 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 E86B32C008E for ; Thu, 11 Oct 2012 15:55:23 +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=1350536124; 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=wKFQ3pXWDT2oOp4KLFLKDyBtbC8=; b=BklLW0efKIDaOLy MNx24w833YeldvKKrDj6SZ/o8r50iIW/OGLWnVW24HgY+AdVNFbQqgk5TQCAfrLW Frz1swszRcLglOmzbGiXM+vLJ/QbhBqkHuvtkK5nhdP0rqBHf+p0uY0aywFmv0Y0 5jMTXtCwND824UZvRChNO7cp+1yU= 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=iMxE6YoJqybjb/cFBn9YCYpN6YwE39Xm6aTRKyX3TxsEMUwZ0qMN/R3/qQViD2 ne6NbQP0iQbs2RTOD3GmorJ0UTBQWmk0vdYiDUwt9XpIYeL45OJio6ZuuTNcRhSO CXu734vPuDGEct1/JQdIW21St3uyjTCELhKdZW6kq/wfo=; Received: (qmail 2967 invoked by alias); 11 Oct 2012 04:54:16 -0000 Received: (qmail 2832 invoked by uid 22791); 11 Oct 2012 04:54:11 -0000 X-SWARE-Spam-Status: No, hits=-3.2 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:06 +0000 Received: by mail-da0-f41.google.com with SMTP id i14so603704dad.0 for ; Wed, 10 Oct 2012 21:54:05 -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=zu6hlmlgda9rh0WnqpmdVJK6YH/bf+ztQslolwD1ZM0=; b=Q0nPTrO9UvN2dLD0xYLZ4bnuW0//q0QhAb9SnzJEOg5I7L7wGc67IJ65zDICUnRqXu WM05dWMcz031wl16Yv3RxzpCnWx5R2g+Olh/tZnnL4S+NYZ38bxZVCQ1A5Fu+645uu1+ Km7nGFnUQPCH0AQwWIwRV3UfsmI1LJ38Rixcm8vpWxvxjbMISdhQks5Yh3UC/pAO9vjM W2RASWyCV5oPWBc8LJH6ZuDG6cDmpCUwMO2tWFGwlLp2CQXPhe4p+son0LiIzagxXT6M fS36Y+eV3JRr3icXd0lduKVVpT3WyYe37lG0UYIqZ2kO623gQtbg4WnKzLDu4tBeeZm5 LpTQ== Received: by 10.68.189.138 with SMTP id gi10mr79727971pbc.165.1349931245587; Wed, 10 Oct 2012 21:54:05 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id vf8sm2121188pbc.27.2012.10.10.21.54.03 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 21:54:05 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 10 of 13] libc/glibc: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom X-Mercurial-Node: 2a9fea5e593095a51ee01fda28b972cb569f6cf4 Message-Id: <2a9fea5e593095a51ee0.1349931199@localhost.localdomain> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.3.1 Date: Thu, 11 Oct 2012 14:53:19 +1000 From: David Holsgrove To: yann.morin.1998@free.fr Cc: crossgcc@sourceware.org X-Gm-Message-State: ALoCoQkLRSIoD5nUKXxS/TLmM29DBjkFj5VpsqZoAOvfc7qhYfz54RhGogGRIFEXjEuR9gOGdxs5 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 2a9fea5e593095a51ee01fda28b972cb569f6cf4 # Parent 88429fc393d9f0b6eaa7fab080ca6d293a888486 libc/glibc: 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 88429fc393d9 -r 2a9fea5e5930 config/libc/glibc.in --- a/config/libc/glibc.in Thu Oct 11 14:39:42 2012 +1000 +++ b/config/libc/glibc.in Thu Oct 11 14:39:43 2012 +1000 @@ -81,8 +81,29 @@ depends on OBSOLETE select LIBC_SUPPORT_LINUXTHREADS +config LIBC_GLIBC_CUSTOM + bool + prompt "Custom glibc" + depends on EXPERIMENTAL + select LIBC_CUSTOM + endchoice +config LIBC_CUSTOM + bool + +if LIBC_GLIBC_CUSTOM + +config LIBC_GLIBC_CUSTOM_LOCATION + string + prompt "Full path to custom glibc source" + default "" + help + Enter the path to the directory (or tarball) of your source for glibc, + or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/glibc + +endif # LIBC_GLIBC_CUSTOM + config LIBC_VERSION string # Don't remove next line @@ -102,3 +123,4 @@ default "2.6" if LIBC_GLIBC_V_2_6 default "2.5.1" if LIBC_GLIBC_V_2_5_1 default "2.5" if LIBC_GLIBC_V_2_5 + default "custom" if LIBC_GLIBC_CUSTOM diff -r 88429fc393d9 -r 2a9fea5e5930 scripts/build/libc/glibc.sh --- a/scripts/build/libc/glibc.sh Thu Oct 11 14:39:42 2012 +1000 +++ b/scripts/build/libc/glibc.sh Thu Oct 11 14:39:43 2012 +1000 @@ -20,10 +20,15 @@ addons_list=($(do_libc_add_ons_list " ")) # Main source - CT_GetFile "glibc-${CT_LIBC_VERSION}" \ - {ftp,http}://ftp.gnu.org/gnu/glibc \ - ftp://gcc.gnu.org/pub/glibc/releases \ - ftp://gcc.gnu.org/pub/glibc/snapshots + if [ "${CT_LIBC_CUSTOM}" = "y" ]; then + CT_GetCustom "glibc" "${CT_LIBC_VERSION}" "${CT_LIBC_CUSTOM_LOCATION}" + CT_LIBC_CUSTOM_LOCATION="${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}" + else + CT_GetFile "glibc-${CT_LIBC_VERSION}" \ + {ftp,http}://ftp.gnu.org/gnu/glibc \ + ftp://gcc.gnu.org/pub/glibc/releases \ + ftp://gcc.gnu.org/pub/glibc/snapshots + fi # C library addons for addon in "${addons_list[@]}"; do