From 1ec6bc5137af4d862c81ceb97abf2511846367f2 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 2 Jun 2014 06:42:04 +0300 Subject: [PATCH] glibc: remove redundant version logic Since commit 990a46fdec6a (glibc: move version handling to Config.in) we use Config.in version strings. Remove glibc.mk duplicate. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/glibc/glibc.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index d4656654e0..a0077d2521 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -4,19 +4,18 @@ # ################################################################################ +GLIBC_VERSION = $(call qstrip,$(BR2_GLIBC_VERSION_STRING)) + ifeq ($(BR2_TOOLCHAIN_BUILDROOT_EGLIBC),y) -GLIBC_VERSION = $(if $(BR2_EGLIBC_VERSION_2_19),2.19-svnr25243,2.18-svnr23787) GLIBC_SITE = http://downloads.yoctoproject.org/releases/eglibc/ GLIBC_SOURCE = eglibc-$(GLIBC_VERSION).tar.bz2 GLIBC_SRC_SUBDIR = libc else -GLIBC_VERSION = $(if $(BR2_GLIBC_VERSION_2_19),2.19,2.18) GLIBC_SITE = $(BR2_GNU_MIRROR)/libc 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) -- 2.30.2