ids-functions.pl: Remove accidently commited debug code.

[people/stevee/ipfire-2.x.git] / lfs / coreutils

diff --git a/lfs/coreutils b/lfs/coreutils
index 63d0a889823900ce3170771a354a9d53f5c53fb0..b64ac7a065730ca62cd455fbe1cb4a2fed18ea09 100644 (file)
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,25 +24,23 @@
 
 include Config
 
-VER        = 8.23
+VER        = 9.0
 
 THISAPP    = coreutils-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
-# Normal build or /tools build.
+# Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  CONFIGURE_OPTIONS = --prefix=/usr
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  CONFIGURE_OPTIONS = --prefix=/tools
 endif
 
 CONFIGURE_OPTIONS += \
-       --disable-selinux \
+       --prefix=$(PREFIX) \
        --enable-largefile \
        --disable-rpath \
        --enable-install-program=arch \
@@ -52,15 +50,20 @@ CONFIGURE_OPTIONS += \
 
 CFLAGS += -fno-strict-aliasing
 
+# Build with 32 bit time_t on 32 bit architectures
+ifeq "$(IS_32BIT)" "1"
+       export TIME_T_32_BIT_OK=yes
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 objects =$(DL_FILE)
 
-$(DL_FILE)                      = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE)= $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5                  = abed135279f87ad6762ce57ff6d89c41
+$(DL_FILE)_MD5 = 0d79ae8a6124546e3b94171375e5e5d0
 
 install : $(TARGET)
 
@@ -90,7 +93,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure $(CONFIGURE_OPTIONS)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils/coreutils-8.27-uname-1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils/coreutils-9.0-i18n-1.patch
+       cd $(DIR_APP) && FORCE_UNSAFE_CONFIGURE=1 && ./configure $(CONFIGURE_OPTIONS)
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
@@ -100,8 +105,6 @@ ifeq "$(ROOT)" ""
        mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin
        mv -v /usr/bin/chroot /usr/sbin
        mv -v /usr/bin/{head,sleep,nice} /bin
-       ln -sf test /bin/[
-       #ln -sf ../../bin/install /usr/bin
        dircolors -p > /etc/DIR_COLORS
 endif