r407 - in x86/trunk/packages: ncurses tar

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sun Jul 24 18:32:51 PDT 2005


Author: jhuntwork
Date: 2005-07-24 19:32:50 -0600 (Sun, 24 Jul 2005)
New Revision: 407

Modified:
   x86/trunk/packages/ncurses/Makefile
   x86/trunk/packages/tar/Makefile
Log:
Updated tar Makefile

Modified: x86/trunk/packages/ncurses/Makefile
===================================================================
--- x86/trunk/packages/ncurses/Makefile	2005-07-24 15:48:44 UTC (rev 406)
+++ x86/trunk/packages/ncurses/Makefile	2005-07-25 01:32:50 UTC (rev 407)
@@ -99,5 +99,6 @@
 
 clean:
 	@-rm -rf $(DIR)
+	@rm -f update.sh 
 
 .PHONY: compile-stage1 clean chroot compile-stage2

Modified: x86/trunk/packages/tar/Makefile
===================================================================
--- x86/trunk/packages/tar/Makefile	2005-07-24 15:48:44 UTC (rev 406)
+++ x86/trunk/packages/tar/Makefile	2005-07-25 01:32:50 UTC (rev 407)
@@ -1,44 +1,96 @@
 # Tar Makefile
+#==============================================================================
 
-# Package versions
 NM= tar
 VRS= 1.15.1
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-PATCH=$(DIR)-sparse_fix-1.patch
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1=$(HTTP)/$(NM)/$(PATCH)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= f861b7524a0867833056dc382e68085234cae6ff
 
-# RULES
+PATCH1= $(DIR)-sparse_fix-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 269dfcc556b6217d27d043ea623df75e19e3d8c9
 
-.PHONY: stage1 clean chroot stage2
+# Targets
+# =============================================================================
 
-stage1:
-	@echo ""
-	@echo "=====> Building $(NM)"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f $(WD)/bin/tar ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 ./configure --prefix=$(WD) && make -j3 && make install ; fi
-	@make clean
+include $(ROOT)/scripts/functions
 
+stage1: $(FILE)
+	@$(std_build)
+	@cp $(SRC)/$(FILE) $(LFSSRC)
+
+compile-stage1:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=$(WD) >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+
 chroot:
-	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-post-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM)"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \
-	 mv $(PATCH) $(SRC) ; fi
-	@if [ ! -f /bin/tar ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i $(SRC)/$(PATCH) && \
-	 ./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin && \
-	 make -j3 && make install ; fi
-	@make clean
-	
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
+	@cp $(SRC)/$(PATCH1) $(LFSSRC)
+
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
+	@./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin && \
+	 >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: compile-stage1 clean chroot compile-stage2




More information about the livecd mailing list