r386 - in x86/trunk/packages: gawk template

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Jul 19 19:40:20 PDT 2005


Author: jhuntwork
Date: 2005-07-19 20:40:19 -0600 (Tue, 19 Jul 2005)
New Revision: 386

Modified:
   x86/trunk/packages/gawk/Makefile
   x86/trunk/packages/template/Makefile
Log:
Updated gawk

Modified: x86/trunk/packages/gawk/Makefile
===================================================================
--- x86/trunk/packages/gawk/Makefile	2005-07-20 02:31:14 UTC (rev 385)
+++ x86/trunk/packages/gawk/Makefile	2005-07-20 02:40:19 UTC (rev 386)
@@ -1,41 +1,88 @@
 # Gawk Makefile
+#==============================================================================
 
-# Package versions
 NM= gawk
 VRS= 3.1.4
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= $(HTTP)/$(NM)/$(FILE)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= ba50753eca7518d5a13fa9a1e1333562cd8477ca
 
-# RULES
+# Targets
+# =============================================================================
 
-.PHONY: stage1 clean chroot stage2
+include $(ROOT)/scripts/functions
 
-stage1:
-	@echo ""
-	@echo "=====> Building $(NM)"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f $(WD)/bin/gawk ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	sed -i 's,ISO-8859-8,ISO-8859-1,' po/it.po && \
-	 ./configure --prefix=$(WD) --libexecdir=$(WD)/lib && make -j3 && \
-	make -C po update-gmo && make install ; fi
-	@make clean
+stage1: $(FILE)
+	@$(std_build)
+	@cp $(SRC)/$(FILE) $(LFSSRC)
 
-chroot:
-	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
+compile-stage1:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@sed -i 's,ISO-8859-8,ISO-8859-1,' po/it.po
+	@./configure --prefix=$(WD) --libexecdir=$(WD)/lib \
+	>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) >>../$(DIR)-$@.log 2>&1
+	@make -C po update-gmo >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f /usr/bin/gawk ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr --libexecdir=/usr/lib && \
-	 make -j3 && make install ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr --libexecdir=/usr/lib >../$(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

Modified: x86/trunk/packages/template/Makefile
===================================================================
--- x86/trunk/packages/template/Makefile	2005-07-20 02:31:14 UTC (rev 385)
+++ x86/trunk/packages/template/Makefile	2005-07-20 02:40:19 UTC (rev 386)
@@ -10,7 +10,7 @@
 SHA-$(FILE)= [sha1sum of $(FILE)]
 
 PATCH1= $(DIR)-some-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH1)
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= [sha1sum of $(PATCH1)
 
 # Targets




More information about the livecd mailing list