From 98be2ca3e0d365d8f1150987cedb145360de582f Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 12 Mar 2015 18:23:49 +0100 Subject: [PATCH] global: change all instances of USE_EGLIBC to USE_GLIBC Signed-off-by: John Crispin --- devel/diffutils/Makefile | 2 +- lang/luaposix/Makefile | 2 +- lang/perl/Config.in | 2 +- lang/perl/Makefile | 6 +++--- lang/perl/perlmod.mk | 2 +- utils/pciutils/Makefile | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile index 33cdc12165..b313dafa42 100644 --- a/devel/diffutils/Makefile +++ b/devel/diffutils/Makefile @@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk define Package/diffutils SECTION:=devel CATEGORY:=Development - DEPENDS:=+USE_EGLIBC:librt + DEPENDS:=+USE_GLIBC:librt TITLE:=diffutils URL:=http://www.gnu.org/software/diffutils/ endef diff --git a/lang/luaposix/Makefile b/lang/luaposix/Makefile index dd4a056716..40cddc054e 100644 --- a/lang/luaposix/Makefile +++ b/lang/luaposix/Makefile @@ -42,7 +42,7 @@ CONFIGURE_VARS += ac_cv_path_LDOC="" TARGET_CFLAGS += -DLUA_USE_LINUX $(FPIC) -std=gnu99 -ifneq ($(CONFIG_USE_EGLIBC),) +ifneq ($(CONFIG_USE_GLIBC),) ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),) TARGET_CFLAGS += -DNO_GETLOGIN endif diff --git a/lang/perl/Config.in b/lang/perl/Config.in index 11cb5eb112..f4c4f8870a 100644 --- a/lang/perl/Config.in +++ b/lang/perl/Config.in @@ -3,7 +3,7 @@ menu "Configuration" config PERL_THREADS bool "Enable threading support" - default y if (mips || mipsel || i386 || i686 || x86_64 || armeb || arm) && (USE_UCLIBC || USE_EGLIBC) + default y if (mips || mipsel || i386 || i686 || x86_64 || armeb || arm) && (USE_UCLIBC || USE_GLIBC) default n config PERL_TESTS diff --git a/lang/perl/Makefile b/lang/perl/Makefile index c3fe981f94..abd327f620 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -36,7 +36,7 @@ HOST_BUILD_PARALLEL:=1 # Variables used during configuration/build HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr -ifneq ($(CONFIG_USE_EGLIBC),) +ifneq ($(CONFIG_USE_GLIBC),) EXTRA_LIBS:=bsd EXTRA_LIBDIRS:=$(STAGING_DIR)/lib endif @@ -50,7 +50,7 @@ ifdef CONFIG_PERL_THREADS PERL_CONFIG_SUFFIX:=-mt # uclibc doesn't provide crypt_r(). Enable crypt() usage for glibc builds only - ifdef CONFIG_USE_EGLIBC + ifdef CONFIG_USE_GLIBC CRYPT_R_PROTO:=REENTRANT_PROTO_B_CCS CRYPT:=define else @@ -79,7 +79,7 @@ define Package/perl CATEGORY:=Languages TITLE:=The Perl intepreter URL:=http://www.perl.com/ - DEPENDS:=+USE_EGLIBC:libbsd +PERL_THREADS:libpthread + DEPENDS:=+USE_GLIBC:libbsd +PERL_THREADS:libpthread endef define Package/perl/description diff --git a/lang/perl/perlmod.mk b/lang/perl/perlmod.mk index 4a4181d285..5b6ba16552 100644 --- a/lang/perl/perlmod.mk +++ b/lang/perl/perlmod.mk @@ -3,7 +3,7 @@ # Build environment HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr -ifneq ($(CONFIG_USE_EGLIBC),) +ifneq ($(CONFIG_USE_GLIBC),) EXTRA_LIBS:=bsd EXTRA_LIBDIRS:=$(STAGING_DIR)/lib endif diff --git a/utils/pciutils/Makefile b/utils/pciutils/Makefile index 90deb66a47..0d7ec33f9a 100644 --- a/utils/pciutils/Makefile +++ b/utils/pciutils/Makefile @@ -50,7 +50,7 @@ MAKE_FLAGS += \ HOST="$(GNU_TARGET_NAME)" \ ZLIB="yes" \ -ifneq ($(CONFIG_USE_EGLIBC),) +ifneq ($(CONFIG_USE_GLIBC),) TARGET_LDFLAGS += -lresolv endif -- 2.30.2