From 7bb2ba345077aa7ce3771a1341d246077580bf67 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 3 Sep 2020 13:49:50 -0700 Subject: [PATCH] coreutils: switch to normal PKG_INSTALL Simplifies the Makefile. Also removed pointless uClibc workaround that is not relevant anymore. Signed-off-by: Rosen Penev --- utils/coreutils/Makefile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/utils/coreutils/Makefile b/utils/coreutils/Makefile index cfe1113c6..fe25061ae 100644 --- a/utils/coreutils/Makefile +++ b/utils/coreutils/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coreutils PKG_VERSION:=8.32 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/coreutils @@ -20,6 +20,7 @@ PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:gnu:coreutils +PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -111,11 +112,6 @@ CONFIGURE_VARS += \ gl_cv_func_mbrtowc_retval=yes \ gl_cv_func_wcrtomb_retval=yes -ifneq ($(CONFIG_USE_UCLIBC),) - CONFIGURE_VARS += \ - ac_cv_type_pthread_spinlock_t=$(if $(filter 0.9.30% 0.9.2% 0.9.31%,$(call qstrip,$(CONFIG_UCLIBC_VERSION))),no,yes) -endif - CONFIGURE_ARGS += \ --disable-xattr \ --enable-install-program=su \ @@ -131,13 +127,6 @@ CONFIGURE_ARGS += \ --without-selinux \ --with-gmp -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - SHELL="/bin/bash" \ - all install -endef - define Package/coreutils/install true endef