r652 - x86/trunk/packages/tar

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sat Sep 17 17:16:48 PDT 2005


Author: jhuntwork
Date: 2005-09-17 18:16:48 -0600 (Sat, 17 Sep 2005)
New Revision: 652

Modified:
   x86/trunk/packages/tar/Makefile
Log:
Updated tar to work with gcc4

Modified: x86/trunk/packages/tar/Makefile
===================================================================
--- x86/trunk/packages/tar/Makefile	2005-09-17 23:26:16 UTC (rev 651)
+++ x86/trunk/packages/tar/Makefile	2005-09-18 00:16:48 UTC (rev 652)
@@ -9,24 +9,30 @@
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= f861b7524a0867833056dc382e68085234cae6ff
 
-PATCH1= $(DIR)-sparse_fix-1.patch
+PATCH1= $(DIR)-gcc4_fix_tests-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 269dfcc556b6217d27d043ea623df75e19e3d8c9
+SHA-$(PATCH1)= ba780e0e88c7993a69d5a498912e135bf16e7df8
 
+PATCH2= $(DIR)-sparse_fix-1.patch
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= 269dfcc556b6217d27d043ea623df75e19e3d8c9
+
+
 # Targets
 # =============================================================================
 
 include $(ROOT)/scripts/functions
 
-stage1: $(FILE)
+stage1: $(FILE) $(PATCH1)
 	@$(std_build)
-	@cp $(SRC)/$(FILE) $(LFSSRC)
+	@cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)/
 
 compile-stage1:
 	@$(call echo_message, Configuring)
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
 	@./configure --prefix=$(WD) >../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================
@@ -55,9 +61,9 @@
 	@chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
 	@$(std_build)
-	@cp $(SRC)/$(PATCH1) $(LFSSRC)
+	@cp $(SRC)/$(PATCH2) $(LFSSRC)
 
 compile-stage2:
 	@$(call echo_message, Configuring)
@@ -65,6 +71,7 @@
 # Configure commands below \/
 #==============================================================================
 	@patch -Np1 -i ../$(PATCH1)
+	@patch -Np1 -i ../$(PATCH2)
 	@./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin \
 	 >../$(DIR)-$@.log 2>&1
 #




More information about the livecd mailing list