KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

eglibc: don't use minor version numbers in config symbols, only in version strings

Browse source 
SVN-Revision: 18474
This commit is contained in:
Nicolas Thill 2009-11-22 12:27:39 +00:00
parent 23bbc4f3e0
commit cfad7b6c08
3 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
toolchain/eglibc/Config.in
View file

@ -5,8 +5,8 @@ choice
help help
Select the version of eglibc you wish to use. Select the version of eglibc you wish to use.
config EGLIBC_VERSION_2_6_1 config EGLIBC_VERSION_2_6
bool "eglibc 2.6.1" bool "eglibc 2.6"
config EGLIBC_VERSION_2_7 config EGLIBC_VERSION_2_7
bool "eglibc 2.7" bool "eglibc 2.7"
@ -17,8 +17,8 @@ choice
config EGLIBC_VERSION_2_9 config EGLIBC_VERSION_2_9
bool "eglibc 2.9" bool "eglibc 2.9"
config EGLIBC_VERSION_2_10_1 config EGLIBC_VERSION_2_10
bool "eglibc 2.10.1" bool "eglibc 2.10"
config EGLIBC_VERSION_TRUNK config EGLIBC_VERSION_TRUNK
bool "eglibc trunk" bool "eglibc trunk"
@ -29,11 +29,11 @@ config EGLIBC_REVISION
string string
prompt "eglibc revision" prompt "eglibc revision"
depends on TOOLCHAINOPTS && USE_EGLIBC depends on TOOLCHAINOPTS && USE_EGLIBC
default "5887" if EGLIBC_VERSION_2_6_1 default "5887" if EGLIBC_VERSION_2_6
default "8588" if EGLIBC_VERSION_2_7 default "8588" if EGLIBC_VERSION_2_7
default "8587" if EGLIBC_VERSION_2_8 default "8587" if EGLIBC_VERSION_2_8
default "8690" if EGLIBC_VERSION_2_9 default "8690" if EGLIBC_VERSION_2_9
default "8873" if EGLIBC_VERSION_2_10_1 default "8873" if EGLIBC_VERSION_2_10
default "HEAD" if EGLIBC_VERSION_TRUNK default "HEAD" if EGLIBC_VERSION_TRUNK
default "" default ""

12
toolchain/eglibc/Config.version
View file

@ -1,17 +1,9 @@
config EGLIBC_VERSION config EGLIBC_VERSION
string string
depends on USE_EGLIBC depends on USE_EGLIBC
default "2.6.1" if EGLIBC_VERSION_2_6_1 default "2.6.1" if EGLIBC_VERSION_2_6
default "2.7" if EGLIBC_VERSION_2_7 default "2.7" if EGLIBC_VERSION_2_7
default "2.8" if EGLIBC_VERSION_2_8 default "2.8" if EGLIBC_VERSION_2_8
default "2.9" if EGLIBC_VERSION_2_9 default "2.9" if EGLIBC_VERSION_2_9
default "2.10.1" if EGLIBC_VERSION_2_10_1 default "2.10.1" if EGLIBC_VERSION_2_10
default "trunk" default "trunk"
config EGLIBC_VERSION_2_6
bool
default y if EGLIBC_VERSION_2_6_1
config EGLIBC_VERSION_2_10
bool
default y if EGLIBC_VERSION_2_10_1

12
toolchain/eglibc/Makefile
View file

@ -15,22 +15,22 @@ PKG_SOURCE_VERSION:=$(PKG_REVISION)
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2
ifeq ($(PKG_VERSION),2.6.1) ifneq ($(CONFIG_EGLIBC_VERSION_2_6),)
PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_6 PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_6
endif endif
ifeq ($(PKG_VERSION),2.7) ifneq ($(CONFIG_EGLIBC_VERSION_2_7),)
PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_7 PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_7
endif endif
ifeq ($(PKG_VERSION),2.8) ifneq ($(CONFIG_EGLIBC_VERSION_2_8),)
PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_8 PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_8
endif endif
ifeq ($(PKG_VERSION),2.9) ifneq ($(CONFIG_EGLIBC_VERSION_2_9),)
PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_9 PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_9
endif endif
ifeq ($(PKG_VERSION),2.10.1) ifneq ($(CONFIG_EGLIBC_VERSION_2_10),)
PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_10 PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_10
endif endif
ifeq ($(PKG_VERSION),trunk) ifneq ($(CONFIG_EGLIBC_VERSION_TRUNK),)
PKG_SOURCE_URL:=svn://svn.eglibc.org/trunk PKG_SOURCE_URL:=svn://svn.eglibc.org/trunk
endif endif