Browse Source

coreutils: switch to normal PKG_INSTALL

Simplifies the Makefile.

Also removed pointless uClibc workaround that is not relevant anymore.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
lilik-openwrt-22.03
Rosen Penev 4 years ago
parent
commit
7bb2ba3450
No known key found for this signature in database GPG Key ID: 36D31CFA845F0E3B
1 changed files with 2 additions and 13 deletions
  1. +2
    -13
      utils/coreutils/Makefile

+ 2
- 13
utils/coreutils/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=coreutils PKG_NAME:=coreutils
PKG_VERSION:=8.32 PKG_VERSION:=8.32
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/coreutils PKG_SOURCE_URL:=@GNU/coreutils
@ -20,6 +20,7 @@ PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:gnu:coreutils PKG_CPE_ID:=cpe:/a:gnu:coreutils
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -111,11 +112,6 @@ CONFIGURE_VARS += \
gl_cv_func_mbrtowc_retval=yes \ gl_cv_func_mbrtowc_retval=yes \
gl_cv_func_wcrtomb_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 += \ CONFIGURE_ARGS += \
--disable-xattr \ --disable-xattr \
--enable-install-program=su \ --enable-install-program=su \
@ -131,13 +127,6 @@ CONFIGURE_ARGS += \
--without-selinux \ --without-selinux \
--with-gmp --with-gmp
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
SHELL="/bin/bash" \
all install
endef
define Package/coreutils/install define Package/coreutils/install
true true
endef endef


Loading…
Cancel
Save