r474 - x86/trunk/packages/unzip

justin at linuxfromscratch.org justin at linuxfromscratch.org
Mon Aug 1 16:54:26 PDT 2005


Author: justin
Date: 2005-08-01 17:54:25 -0600 (Mon, 01 Aug 2005)
New Revision: 474

Modified:
   x86/trunk/packages/unzip/Makefile
Log:
Updated unzip Makefile.

Modified: x86/trunk/packages/unzip/Makefile
===================================================================
--- x86/trunk/packages/unzip/Makefile	2005-08-01 23:43:07 UTC (rev 473)
+++ x86/trunk/packages/unzip/Makefile	2005-08-01 23:54:25 UTC (rev 474)
@@ -1,45 +1,76 @@
 # UnZip Makefile
+#==============================================================================
 
-# Package versions
 NM= unzip
 VRS= 5.52
 DIR= $(NM)-$(VRS)
-FILE= $(NM)552.tar.gz
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/T-V/$(FILE)
+SHA-$(FILE)= b48f6b6446c31d3ebc163d134a2500b7fef57047
+
 PATCH1= $(DIR)-fix_Makefile-1.patch
+URL-$(PATCH1)= $(HTTPBLFS)/T-V/$(PATCH1)
+SHA-$(PATCH1)= c31f606dfc179e6068b006a5c9c35f551adc82f7
+
 PATCH2= $(DIR)-fix_libz-1.patch
+URL-$(PATCH2)= $(HTTPBLFS)/T-V/$(PATCH2)
+SHA-$(PATCH2)= b318855331e0b007a3389e4b66708f6bca1517bd
+
 PATCH3= $(DIR)-dont_make_noise-1.patch
-URL= http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/src/$(FILE)
-URL1= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH1)
-URL2= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH2)
-URL3= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH3)
+URL-$(PATCH3)= $(HTTPBLFS)/T-V/$(PATCH3)
+SHA-$(PATCH3)= e1bef189a3a8635beae6efc54b92f304557a9895
 
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
 
-#RULES
+chroot:
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-.PHONY: clean chroot stage2
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3)
+	@$(std_build)
 
-chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
+	@patch -Np1 -i ../$(PATCH2)
+	@patch -Np1 -i ../$(PATCH3)
+	@cp unix/Makefile .
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux \
+	 >../$(DIR)-$@.log 2>&1
+	@make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux_shlibz \
+	 >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK install \
+	 >>../$(DIR)-$@.log 2>&1
+	@cp -d libunzip.so* /usr/lib
+#
+#==Status Messages===========================================
+#
+	@$(OK)
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f $(PATCH1) ] ; then $(WGET) $(URL1) ; fi
-	@if [ ! -f $(PATCH2) ] ; then $(WGET) $(URL2) ; fi
-	@if [ ! -f $(PATCH3) ] ; then $(WGET) $(URL3) ; fi
-	@if [ ! -f /usr/bin/unzip ] ; then unpack $(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(PATCH1) && \
-	 patch -Np1 -i ../$(PATCH2) && \
-	 patch -Np1 -i ../$(PATCH3) && \
-	 cp unix/Makefile . && \
-	 make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux && \
-	 make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK linux_shlibz && \
-	 make prefix=/usr LOCAL_UNZIP=-DUSE_UNSHRINK install && \
-	 cp -d libunzip.so* /usr/lib ; fi
-	@make clean
-
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list