X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcoreutils;h=26482aa0f5c81524ad7085544ac76c59eb505e8b;hb=ca4c354e085083dacf66071b23e507ea2ebb1b81;hp=ede0493916acbe1022db31282527eee702cfc28f;hpb=364452506fcc7170c000d2ac7fe7ae67351a6241;p=ipfire-2.x.git diff --git a/lfs/coreutils b/lfs/coreutils index ede0493916..26482aa0f5 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team # +# Copyright (C) 2007-2017 IPFire Team # # # # 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.24 +VER = 8.27 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 \ @@ -58,9 +56,9 @@ CFLAGS += -fno-strict-aliasing objects =$(DL_FILE) -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) +$(DL_FILE)= $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 40efdbce865d2458d8da0a9dcee7c16c +$(DL_FILE)_MD5 = 502795792c212932365e077946d353ae install : $(TARGET) @@ -90,7 +88,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-8.27-uname-1.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-8.27-i18n-1.patch + cd $(DIR_APP) && FORCE_UNSAFE_CONFIGURE=1 && ./configure $(CONFIGURE_OPTIONS) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install