Patchwork [10,of,13] libc/glibc: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom

login
register
mail settings
Submitter David Holsgrove
Date Oct. 11, 2012, 4:53 a.m.
Message ID <2a9fea5e593095a51ee0.1349931199@localhost.localdomain>
Download mbox | patch
Permalink /patch/190792/
State Superseded, archived
Headers show

Comments

David Holsgrove - Oct. 11, 2012, 4:53 a.m.
# HG changeset patch
# User David Holsgrove <david.holsgrove@xilinx.com>
# 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" <david.holsgrove@xilinx.com>


--
For unsubscribe information see http://sourceware.org/lists.html#faq

Patch

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