X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcoreutils;h=d0f35c205a080e9dfbdcd3f0db00479d6f3fcf99;hp=5c56b09db810951fa2ad05ca60967876c59fbba1;hb=826c22d66c3eae74bb4c7287cdd81478a5341e01;hpb=cd1a2927226c734d96478e12bb768256fb64a06a diff --git a/lfs/coreutils b/lfs/coreutils index 5c56b09db..d0f35c205 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -1,28 +1,20 @@ ############################################################################### -# This file is part of the IPCop Firewall. # # # -# IPCop is free software; you can redistribute it and/or modify # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 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 # -# the Free Software Foundation; either version 2 of the License, or # +# the Free Software Foundation, either version 3 of the License, or # # (at your option) any later version. # # # -# IPCop is distributed in the hope that it will be useful, # +# This program is distributed in the hope that it will be useful, # # but WITHOUT ANY WARRANTY; without even the implied warranty of # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # GNU General Public License for more details. # # # # You should have received a copy of the GNU General Public License # -# along with IPCop; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Makefiles are based on LFSMake, which is # -# Copyright (C) 2002 Rod Roard # -# # -# Modifications by: # -# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> # -# - Modified Makefile for IPCop build # -# # -# $Id: coreutils,v 1.5.2.8 2006/01/21 15:01:58 franck78 Exp $ +# along with this program. If not, see . # # # ############################################################################### @@ -32,11 +24,11 @@ include Config -VER = 5.93 +VER = 5.96 THISAPP = coreutils-$(VER) DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_GNU)/coreutils +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) # Normal build or /tools build. @@ -48,21 +40,22 @@ ifeq "$(ROOT)" "" EXTRA_INSTALL = else TARGET = $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG = --prefix=/tools --disable-nls --host=$(MACHINE) + EXTRA_CONFIG = --prefix=/tools --disable-nls EXTRA_MAKE = EXTRA_INSTALL = endif +EXTRA_CONFIG += ac_cv_func_working_mktime=yes + ############################################################################### # Top-level Rules ############################################################################### -objects =$(DL_FILE) $(THISAPP)-uname-1.patch + +objects =$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(THISAPP)-uname-1.patch = $(URL_LFS)/coreutils/$(THISAPP)-uname-1.patch -$(DL_FILE)_MD5 = 955d8abfd3dd8af2ca3af51480f1f9af -$(THISAPP)-uname-1.patch_MD5 = c05b735710fbd62239588c07084852a0 +$(DL_FILE)_MD5 = bf55d069d82128fd754a090ce8b5acff install : $(TARGET) @@ -92,35 +85,33 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-uname-1.patch -ifneq "$(ROOT)" "" - #previous patch of uname implies rebuild of doc/uname.1 which fails; remove doc&man build from toolchain - cd $(DIR_APP) && sed -i "s/SUBDIRS = lib src doc man po tests/SUBDIRS = lib src po tests/g" Makefile.in + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-5.96-rename-tee.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-5.96-futimes.patch +ifeq "$(ROOT)" "" +ifeq "$(MACHINE)" "i586" + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-uname-1.patch +endif + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-suppress_uptime_kill_su-1.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-i18n-1.patch + cd $(DIR_APP) && chmod +x tests/sort/sort-mb-tests + cd $(DIR_APP) && sed -i 's/_LEN 6/_LEN 20/' src/who.c endif - cd $(DIR_APP) && DEFAULT_POSIX2_VERSION=199209 ./configure $(EXTRA_CONFIG) - cd $(DIR_APP) && make -j 3 $(EXTRA_MAKE) + cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make $(EXTRA_INSTALL) install #use hostname from inet-tools ifeq "$(ROOT)" "" rm /usr/bin/hostname - mv -f /usr/bin/{basename,cat,chgrp,chmod,chown,cp,dd,df} /bin - mv -f /usr/bin/{dir,dircolors,du,date,echo,false,head} /bin - mv -f /usr/bin/{install,ln,ls,mkdir,mkfifo,mknod,mv,pwd} /bin - mv -f /usr/bin/{rm,rmdir,shred,sync,sleep,stty,su,test} /bin - mv -f /usr/bin/{touch,true,uname,vdir} /bin - mv -f /usr/bin/chroot /usr/sbin + mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin + mv -v /usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} /bin + 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 - mv -f /bin/uname /bin/uname.bak - echo '#!/bin/bash' > /bin/uname - echo '/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g'' >> /bin/uname - chmod 755 /bin/uname + #ln -sf ../../bin/install /usr/bin + dircolors -p > /etc/DIR_COLORS else rm /tools/bin/hostname - mv -f /tools/bin/uname /tools/bin/uname.bak - echo '#!/bin/bash' > /tools/bin/uname - echo '/tools/bin/uname.bak $$* | sed 's/i.86/$(MACHINE)/g'' >> /tools/bin/uname - chmod 755 /tools/bin/uname endif @rm -rf $(DIR_APP) @$(POSTBUILD)