summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/kconfig/eglibc.kconfig60
-rw-r--r--core/mk/eglibc.mk12
2 files changed, 16 insertions, 56 deletions
diff --git a/core/kconfig/eglibc.kconfig b/core/kconfig/eglibc.kconfig
index 2e927e0..1a0ec88 100644
--- a/core/kconfig/eglibc.kconfig
+++ b/core/kconfig/eglibc.kconfig
@@ -1,6 +1,6 @@
################################################################################
# Embtoolkit
-# Copyright(C) 2009-2014 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2016 Abdoulaye Walsimou GAYE.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,11 +23,7 @@
# \date May 2009
################################################################################
-config EMBTK_EGLIBC_VERSION_SVN
- bool
- default y
-
-config EMBTK_EGLIBC_REFSPEC
+config EMBTK_EGLIBC_CATEGORY
string
default "toolchain"
@@ -38,62 +34,24 @@ choice
config EMBTK_EGLIBC_VERSION_2_19
bool "eglibc-2.19"
+ select EMBTK_EGLIBC_NEED_PATCH
config EMBTK_EGLIBC_VERSION_2_17
bool "eglibc-2.17"
- config EMBTK_EGLIBC_VERSION_TRUNK
- bool "trunk (development version)"
+ select EMBTK_EGLIBC_NEED_PATCH
endchoice
-config EMBTK_EGLIBC_SVN_REVISION
- int "EGLIBC SVN revision to checkout (Please read the help below)"
- help
- EGLIBC svn revision to use.
- This revision is the latest at EmbToolkit release.
- If at the moment you build your toolchain new revision is available,
- you can increase this value.
-
- default 25890 if EMBTK_EGLIBC_VERSION_2_19
- default 25892 if EMBTK_EGLIBC_VERSION_2_17
- default 25237 if EMBTK_EGLIBC_VERSION_TRUNK
-
-comment "At EmbToolkit release, valid eglibc svn revisions are:"
-comment "svn revision 25890 for eglibc-2.19"
-comment "svn revision 25892 for eglibc-2.17"
-comment "svn revision 25237 for eglibc-trunk (development version)"
-comment ""
-
-config EMBTK_EGLIBC_SVN_BRANCH
- string
- default "branches/eglibc-2_19" if EMBTK_EGLIBC_VERSION_2_19
- default "branches/eglibc-2_17" if EMBTK_EGLIBC_VERSION_2_17
- default "trunk" if EMBTK_EGLIBC_VERSION_TRUNK
-
config EMBTK_EGLIBC_VERSION_STRING
string
default "2.19" if EMBTK_EGLIBC_VERSION_2_19
default "2.17" if EMBTK_EGLIBC_VERSION_2_17
- default "trunk" if EMBTK_EGLIBC_VERSION_TRUNK
-#Does we need patches?
-config EMBTK_EGLIBC_NEED_PATCH
- bool
- default y
-
-config EMBTK_EGLIBC_HEADERS_SVN_REVISION
- int
- default EMBTK_EGLIBC_SVN_REVISION
-config EMBTK_EGLIBC_HEADERS_SVN_BRANCH
- string
- default EMBTK_EGLIBC_SVN_BRANCH
-config EMBTK_EGLIBC_HEADEERS_VERSION_STRING
+config EMBTK_EGLIBC_SHA1
string
- default EMBTK_EGLIBC_VERSION_STRING
-config EMBTK_EGLIBC_HEADERS_NEED_PATCH
- bool
- default EMBTK_EGLIBC_NEED_PATCH
-config EMBTK_EGLIBC_HEADERS_VERSION_SVN
+ default "0667012d4e4c87b1bb8fdc7ea6d750aeebc69ecb" if EMBTK_EGLIBC_VERSION_2_19
+ default "9c308032bbbe52a26f8c4d8363dcca7d6e4905c3" if EMBTK_EGLIBC_VERSION_2_17
+
+config EMBTK_EGLIBC_NEED_PATCH
bool
- default EMBTK_EGLIBC_VERSION_SVN
comment "------------------------------------"
comment "----- EGLIBC options configuration"
diff --git a/core/mk/eglibc.mk b/core/mk/eglibc.mk
index 13c4c3f..54042e2 100644
--- a/core/mk/eglibc.mk
+++ b/core/mk/eglibc.mk
@@ -23,11 +23,13 @@
# \date May 2009
################################################################################
-EGLIBC_NAME := eglibc
-EGLIBC_VERSION := $(call embtk_get_pkgversion,eglibc)
-EGLIBC_SVN_SITE := http://www.eglibc.org/svn
-EGLIBC_SRC_DIR := $(call __embtk_pkg_localsvn,eglibc)
-EGLIBC_BUILD_DIR := $(embtk_toolsb)/eglibc-build
+EGLIBC_NAME := eglibc
+EGLIBC_VERSION := $(call embtk_get_pkgversion,eglibc)
+EGLIBC_SITE := $(embtk_ftp/packages-mirror)
+EGLIBC_GIT_SITE := git://sourceware.org/git/glibc.git
+EGLIBC_PACKAGE := eglibc-$(EGLIBC_VERSION).tar.bz2
+EGLIBC_SRC_DIR := $(embtk_toolsb)/eglibc-$(EGLIBC_VERSION)
+EGLIBC_BUILD_DIR := $(embtk_toolsb)/eglibc-$(EGLIBC_VERSION)-build
__embtk_eglibc_cflags := $(filter-out $(__clang_cflags),$(TARGET_CFLAGS))
__embtk_eglibc_cflags += $(EMBTK_TARGET_MCPU)