r397 - x86/trunk/packages/gzip

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sat Jul 23 22:55:22 PDT 2005


Author: jhuntwork
Date: 2005-07-23 23:55:21 -0600 (Sat, 23 Jul 2005)
New Revision: 397

Modified:
   x86/trunk/packages/gzip/Makefile
Log:
Updated gzip to new format

Modified: x86/trunk/packages/gzip/Makefile
===================================================================
--- x86/trunk/packages/gzip/Makefile	2005-07-23 20:25:09 UTC (rev 396)
+++ x86/trunk/packages/gzip/Makefile	2005-07-24 05:55:21 UTC (rev 397)
@@ -1,51 +1,101 @@
 # Gzip Makefile
+#==============================================================================
 
-# Package versions
 NM= gzip
 VRS= 1.3.5
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-PATCH= $(DIR)-security_fixes-1.patch
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= c860a851959d77e45ff153183b43723dd5a5c542
 
-# RULES
+PATCH1= $(DIR)-security_fixes-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 3ab15ed9fa2b8b3e26b6f8d878f5cf43f822abca
 
-.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/gzip ] ; 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) in chroot"
-	@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/gzip ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i $(SRC)/$(PATCH) && \
-	 ./configure --prefix=/usr && \
-	 sed -i 's@"BINDIR"@/bin at g' gzexe.in && \
-	 make -j3 && make install && \
-	 mv /usr/bin/gzip /bin && \
-	 rm /usr/bin/{gunzip,zcat} && \
-	 ln -sf gzip /bin/gunzip && \
-	 ln -sf gzip /bin/zcat && \
-	 ln -sf gzip /bin/compress && \
-	 ln -sf gunzip /bin/uncompress ; fi
-	@make clean
-	
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
+
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
+	@./configure --prefix=/usr >../$(DIR)-$@.log 2>&1
+	@sed -i 's@"BINDIR"@/bin at g' gzexe.in
+#
+#==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
+	@mv /usr/bin/gzip /bin
+	@rm /usr/bin/{gunzip,zcat}
+	@ln -sf gzip /bin/gunzip
+	@ln -sf gzip /bin/zcat
+	@ln -sf gzip /bin/compress
+	@ln -sf gunzip /bin/uncompress
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: compile-stage1 clean chroot compile-stage2




More information about the livecd mailing list