r511 - in x86/trunk: . packages/libaal packages/libjpeg packages/libpng packages/libungif packages/libxml2 packages/libxslt

justin at linuxfromscratch.org justin at linuxfromscratch.org
Tue Aug 2 13:57:50 PDT 2005


Author: justin
Date: 2005-08-02 14:57:49 -0600 (Tue, 02 Aug 2005)
New Revision: 511

Modified:
   x86/trunk/packages/libaal/Makefile
   x86/trunk/packages/libjpeg/Makefile
   x86/trunk/packages/libpng/Makefile
   x86/trunk/packages/libungif/Makefile
   x86/trunk/packages/libxml2/Makefile
   x86/trunk/packages/libxslt/Makefile
   x86/trunk/todo-list
Log:
Updated libaal,libjpeg,libpng,libungif,libxml2,libxslt Makefiles.

Modified: x86/trunk/packages/libaal/Makefile
===================================================================
--- x86/trunk/packages/libaal/Makefile	2005-08-02 20:53:07 UTC (rev 510)
+++ x86/trunk/packages/libaal/Makefile	2005-08-02 20:57:49 UTC (rev 511)
@@ -1,29 +1,56 @@
 # libaal Makefile
+#==============================================================================
 
-# Package versions
 NM= libaal
 VRS= 1.0.4
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.gz
-URL= http://linuxberg.vc-graz.ac.at/mirror/reiserfs/reiser4progs/$(FILE)
+URL-$(FILE)= http://linuxberg.vc-graz.ac.at/mirror/reiserfs/reiser4progs/$(FILE)
+SHA-$(FILE)= 29df5c1c12b576ec5f6dbf3e78b73e8ab645a331
 
-#RULES
+# Targets
+# =============================================================================
 
-.PHONY: clean chroot stage2
+include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-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 /usr/lib/libaal.so ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr && \
-	 make -j3 && \
-	 make install ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr >../$(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: clean chroot compile-stage2

Modified: x86/trunk/packages/libjpeg/Makefile
===================================================================
--- x86/trunk/packages/libjpeg/Makefile	2005-08-02 20:53:07 UTC (rev 510)
+++ x86/trunk/packages/libjpeg/Makefile	2005-08-02 20:57:49 UTC (rev 511)
@@ -1,29 +1,58 @@
 # libjpeg Makefile
+#==============================================================================
 
-# Package versions
 NM= libjpeg
 VRS= 6b
-DIR= jpeg-$(VRS) 
-FILE= jpegsrc.v$(VRS).tar.gz
-URL= http://www.ijg.org/files/$(FILE)
+DIR= jpeg-$(VRS)
 
+FILE= jpegsrc.v$(VRS).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/I-K/$(FILE)
+SHA-$(FILE)= 9064e88e8c8bde13fb7ba809f3b84fa0737a981d
 
-#RULES
+# Targets
+# =============================================================================
 
-.PHONY: clean chroot stage2
+include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-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 /usr/lib/libjpeg.so ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr --enable-static --enable-shared && \
-	 make -j3 && make install && /sbin/ldconfig ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:	
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr --enable-static --enable-shared \
+	 >../$(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
+	@/sbin/ldconfig
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/libpng/Makefile
===================================================================
--- x86/trunk/packages/libpng/Makefile	2005-08-02 20:53:07 UTC (rev 510)
+++ x86/trunk/packages/libpng/Makefile	2005-08-02 20:57:49 UTC (rev 511)
@@ -4,32 +4,60 @@
 NM= libpng
 VRS= 1.2.8
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-PATCH= $(DIR)-link_to_proper_libs-1.patch
-URL= http://easynews.dl.sourceforge.net/sourceforge/libpng/$(FILE)
-URL1= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH)
+URL-$(FILE)= $(HTTPBLFS)/L/$(FILE)
+SHA-$(FILE)= b6d73493eea4095166118b298efecb54a8e3d2f5
 
+PATCH1= $(DIR)-link_to_proper_libs-1.patch
+URL-$(PATCH1)= $(HTTPBLFS)/L/$(PATCH1)
+SHA-$(PATCH1)= 24e552875bab65ed200e720c4a58dc92d92ba903
 
+# Targets
+# =============================================================================
 
-#RULES
+include $(ROOT)/scripts/functions
 
-.PHONY: clean chroot stage2
-
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-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 $(PATCH) ] ; then $(WGET) $(URL1) ; fi
-	@if [ ! -f /usr/lib/libpng.so ] ; then unpack $(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(PATCH) && \
-	 make prefix=/usr ZLIBINC=/usr/include ZLIBLIB=/usr/lib -f scripts/makefile.linux && \
-	 make prefix=/usr install -f scripts/makefile.linux && \
-	 /sbin/ldconfig ; fi
-	@make clean
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH) >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make prefix=/usr ZLIBINC=/usr/include ZLIBLIB=/usr/lib \
+	 -f scripts/makefile.linux >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make prefix=/usr install -f scripts/makefile.linux \
+	 >>../$(DIR)-$@.log 2>&1
+	@/sbin/ldconfig
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/libungif/Makefile
===================================================================
--- x86/trunk/packages/libungif/Makefile	2005-08-02 20:53:07 UTC (rev 510)
+++ x86/trunk/packages/libungif/Makefile	2005-08-02 20:57:49 UTC (rev 511)
@@ -1,28 +1,56 @@
 # LibUngif Makefile
+#==============================================================================
 
-# Package versions
 NM= libungif
 VRS= 4.1.3
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= http://easynews.dl.sourceforge.net/sourceforge/libungif/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/L/$(FILE)
+SHA-$(FILE)= 04aab31b3e9e719a80320667bc23b3ee35505a34
 
-#RULES
+# Targets
+# =============================================================================
 
-.PHONY: clean chroot stage2
+include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-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 /usr/lib/libungif.so ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr && \
-	 make -j3 && make install ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr >../$(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: clean chroot compile-stage2

Modified: x86/trunk/packages/libxml2/Makefile
===================================================================
--- x86/trunk/packages/libxml2/Makefile	2005-08-02 20:53:07 UTC (rev 510)
+++ x86/trunk/packages/libxml2/Makefile	2005-08-02 20:57:49 UTC (rev 511)
@@ -1,30 +1,56 @@
 # LibXML2 Makefile
+#==============================================================================
 
-# Package versions
 NM= libxml2
-VRS= 2.6.19
+VRS= 2.6.20
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= http://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/L/$(FILE)
+SHA-$(FILE)= 3ed04f5f5ffffef5b8116da2b18fb06f73aa5f9e
 
+# 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)
+	@$(std_build)
 
-chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr --with-history >../$(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)
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /usr/bin/xmllint ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr --with-history && \
-	 make -j3 && make install ; fi
-	@make clean
-
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/libxslt/Makefile
===================================================================
--- x86/trunk/packages/libxslt/Makefile	2005-08-02 20:53:07 UTC (rev 510)
+++ x86/trunk/packages/libxslt/Makefile	2005-08-02 20:57:49 UTC (rev 511)
@@ -1,30 +1,56 @@
 # libxslt Makefile
+#==============================================================================
 
-# Package versions
 NM= libxslt
 VRS= 1.1.14
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= http://ftp.gnome.org/pub/GNOME/sources/libxslt/1.1/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/L/$(FILE)
+SHA-$(FILE)= 9b6d3c417b943ad11abaa6fb8e2f936107e63899
 
+# 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)
+	@$(std_build)
 
-chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr >../$(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)
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /usr/bin/xsltproc ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr && \
-	 make -j3 && make install ; fi
-	@make clean
-
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-02 20:53:07 UTC (rev 510)
+++ x86/trunk/todo-list	2005-08-02 20:57:49 UTC (rev 511)
@@ -3,12 +3,6 @@
 hotplug
 inputattach
 lfs-bootscripts
-libaal
-libjpeg
-libpng
-libungif
-libxml2
-libxslt
 links
 lua
 lynx




More information about the livecd mailing list