r531 - in x86/trunk: . packages/popt

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 16:06:02 PDT 2005


Author: jhuntwork
Date: 2005-08-02 17:06:01 -0600 (Tue, 02 Aug 2005)
New Revision: 531

Modified:
   x86/trunk/packages/popt/Makefile
   x86/trunk/todo-list
Log:
Updated popt Makefile

Modified: x86/trunk/packages/popt/Makefile
===================================================================
--- x86/trunk/packages/popt/Makefile	2005-08-02 23:04:35 UTC (rev 530)
+++ x86/trunk/packages/popt/Makefile	2005-08-02 23:06:01 UTC (rev 531)
@@ -1,35 +1,65 @@
 # popt Makefile
+#==============================================================================
 
-# Package versions
 NM= popt
 VRS= 1.7
 DIR= $(NM)-$(VRS)
-FILE= $(NM)_$(VRS).orig.tar.gz
-PATCH1= $(NM)_$(VRS)-5.diff
-URL= http://ftp.debian.org/debian/pool/main/p/$(NM)/$(FILE)
-URL1= http://ftp.debian.org/debian/pool/main/p/$(NM)/$(PATCH1).gz
 
-# RULES
+FILE= $(NM)_$(VRS).orig.tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/M-P/$(FILE)
+SHA-$(FILE)= 5b9248195f3623a0fa88f3bf4d68aef4cabd619f
 
-.PHONY: clean stage2 chroot
+PATCH1= $(NM)_$(VRS)-5.diff.bz2
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 774d7b2ea41128ca8b46bc834f3de1052c4fb9dc
 
+# Targets
+# =============================================================================
+
+include $(ROOT)/scripts/functions
+
 chroot:
-	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f $(PATCH1) ] ; then $(WGET) $(URL1) && \
-	 gunzip $(PATCH1).gz ; fi
-	@if [ ! -f /usr/lib/libpopt.a ] ; then unpack $(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(PATCH1) && \
-	 ./configure --prefix=/usr && \
-	 cp configure.in configure.ac && \
-	 touch configure.in configure.ac && \
-	 make -j3 && make install ; fi
-	@make clean
-	 
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(sep_build)
+
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@bzcat ../$(PATCH1) > ../$(DIR)-5.diff
+	@patch -Np1 -i ../$(DIR)-5.diff
+	@./configure --prefix=/usr >../$(DIR)-$@.log 2>&1
+	@cp configure.in configure.ac
+	@touch configure.in configure.ac
+#
+#==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)
+	@-rm -f $(DIR)-5.diff
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-02 23:04:35 UTC (rev 530)
+++ x86/trunk/todo-list	2005-08-02 23:06:01 UTC (rev 531)
@@ -8,7 +8,6 @@
 pango
 pciutils
 pkgconfig
-popt
 procps
 psmisc
 shadow




More information about the livecd mailing list