r344 - in x86/branches/utf8: . packages/diffutils

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Tue Jul 12 07:47:59 PDT 2005


Author: alexander
Date: 2005-07-12 08:47:58 -0600 (Tue, 12 Jul 2005)
New Revision: 344

Modified:
   x86/branches/utf8/Makefile
   x86/branches/utf8/packages/diffutils/Makefile
Log:
Built packages before grep


Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile	2005-07-12 14:12:07 UTC (rev 343)
+++ x86/branches/utf8/Makefile	2005-07-12 14:47:58 UTC (rev 344)
@@ -174,7 +174,7 @@
 	ch-readline ch-m4 ch-bison ch-less ch-groff ch-sed ch-flex ch-gettext ch-inetutils \
 	ch-iproute2 ch-perl ch-texinfo ch-autoconf ch-automake ch-bash
 
-post-bash: ch-file ch-libtool ch-bzip2 stop-here ch-diffutils ch-kbd ch-e2fsprogs ch-grep ch-grub ch-gzip \
+post-bash: ch-file ch-libtool ch-bzip2 ch-diffutils ch-kbd ch-e2fsprogs stop-here ch-grep ch-grub ch-gzip \
 	ch-hotplug ch-man ch-make ch-module-init-tools ch-patch ch-procps ch-psmisc ch-shadow \
 	ch-sysklogd ch-sysvinit ch-tar ch-udev ch-util-linux ch-environment
 

Modified: x86/branches/utf8/packages/diffutils/Makefile
===================================================================
--- x86/branches/utf8/packages/diffutils/Makefile	2005-07-12 14:12:07 UTC (rev 343)
+++ x86/branches/utf8/packages/diffutils/Makefile	2005-07-12 14:47:58 UTC (rev 344)
@@ -7,6 +7,11 @@
 FILE= $(DIR).tar.bz2
 URL= $(HTTP)/$(NM)/$(FILE)
 
+RHPATCHES= \
+	diffutils-2.8.1-badc.patch \
+	diffutils-sdiff.patch \
+	diffutils-2.8.4-i18n.patch
+
 # RULES
 
 .PHONY: stage1 clean chroot stage2
@@ -31,6 +36,9 @@
 	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
 	 mv $(FILE) $(SRC) ; fi
 	@if [ ! -f /usr/bin/diff ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
+	 for RHPATCH in $(RHPATCHES) ; do \
+	  patch -Np1 -i $(REDHAT)/diffutils/$$RHPATCH ; \
+	 done && \
 	 ./configure --prefix=/usr && make -j3 && make install ; fi
 	@make clean
 	




More information about the livecd mailing list