glibc: move version handling to Config.in

Like we do elsewhere. No functional change, but nicer and easier to keep in
sync.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/glibc/Config.in b/package/glibc/Config.in
index d9b6acc80bbfbc4c57b2e4ebe9bcbd2b1c53b9ad..c2d62318471e5a1e67883ce333a357d3d40e7d44 100644 (file)
--- a/package/glibc/Config.in
+++ b/package/glibc/Config.in
@@ -32,3 +32,10 @@ config BR2_GLIBC_VERSION_2_19
 endchoice
 
 endif
+
+config BR2_GLIBC_VERSION_STRING
+       string
+       default "2.18-svnr23787" if BR2_EGLIBC_VERSION_2_18
+       default "2.19-svnr25243" if BR2_EGLIBC_VERSION_2_19
+       default "2.18" if BR2_GLIBC_VERSION_2_18
+       default "2.19" if BR2_GLIBC_VERSION_2_19

diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index f841fd05450d768438255f00fa0f2de6d200c213..d4656654e0d64b61579adc8420722c2335739c56 100644 (file)
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -16,6 +16,7 @@ GLIBC_SOURCE = glibc-$(GLIBC_VERSION).tar.xz
 GLIBC_SRC_SUBDIR = .
 endif
 
+GLIBC_VERSION = $(call qstrip,$(BR2_GLIBC_VERSION_STRING))
 GLIBC_LICENSE = GPLv2+ (programs), LGPLv2.1+, BSD-3c, MIT (library)
 GLIBC_LICENSE_FILES = $(addprefix $(GLIBC_SRC_SUBDIR)/,COPYING COPYING.LIB LICENSES)