r413 - in x86/trunk/packages: perl template util-linux

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Jul 26 21:30:23 PDT 2005


Author: jhuntwork
Date: 2005-07-26 22:30:19 -0600 (Tue, 26 Jul 2005)
New Revision: 413

Modified:
   x86/trunk/packages/perl/Makefile
   x86/trunk/packages/template/Makefile
   x86/trunk/packages/util-linux/Makefile
Log:
Updated perl Makefile, typo in template Makefile and fixed logging in util-linux

Modified: x86/trunk/packages/perl/Makefile
===================================================================
--- x86/trunk/packages/perl/Makefile	2005-07-27 04:03:04 UTC (rev 412)
+++ x86/trunk/packages/perl/Makefile	2005-07-27 04:30:19 UTC (rev 413)
@@ -1,46 +1,98 @@
 # Perl Makefile
+#==============================================================================
 
-# Package versions
 NM= perl
-VRS= 5.8.6
+VRS= 5.8.7
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-PATCH= $(DIR)-libc-1.patch
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= c9477c6fe76b200033694bdc555a0276523d4228
 
-# RULES
+PATCH1= $(DIR)-libc-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= e515154714acdbb1dbdbeb71727649895e26f50d
 
-.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 $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \
-	 mv $(PATCH) $(SRC) ; fi
-	@if [ ! -d $(WD)/lib/perl5/$(VRS) ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i $(SRC)/$(PATCH) && \
-	 ./configure.gnu --prefix=$(WD) -Dstatic_ext='IO Fcntl POSIX' && \
-	 make -j3 perl utilities && cp perl pod/pod2man $(WD)/bin && \
-	 mkdir -p $(WD)/lib/perl5/$(VRS) && cp -R lib/* $(WD)/lib/perl5/$(VRS) ; fi
-	@make clean
+include $(ROOT)/scripts/functions
 
+stage1: $(FILE) $(PATCH1)
+	@$(std_build)
+	@cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
+
+compile-stage1:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
+	@./configure.gnu --prefix=$(WD) -Dstatic_ext='IO Fcntl POSIX' \
+	 >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) perl utilities >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@cp perl pod/pod2man $(WD)/bin
+	@mkdir -p $(WD)/lib/perl5/$(VRS)
+	@cp -R lib/* $(WD)/lib/perl5/$(VRS)
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+
 chroot:
-	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
+	@chroot "$(MP)" $(chenv-pre-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f /usr/bin/perl$(VRS) ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 ./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" && \
-	 make && make install ; fi
-	@make clean
-	
+stage2: Makefile $(FILE)
+	@$(std_build)
+
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure.gnu --prefix=/usr -Dpager="/bin/less -isR" \
+	 >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make >>../$(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-27 04:03:04 UTC (rev 412)
+++ x86/trunk/packages/template/Makefile	2005-07-27 04:30:19 UTC (rev 413)
@@ -11,7 +11,7 @@
 
 PATCH1= $(DIR)-some-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= [sha1sum of $(PATCH1)
+SHA-$(PATCH1)= [sha1sum of $(PATCH1)]
 
 # Targets
 # =============================================================================

Modified: x86/trunk/packages/util-linux/Makefile
===================================================================
--- x86/trunk/packages/util-linux/Makefile	2005-07-27 04:03:04 UTC (rev 412)
+++ x86/trunk/packages/util-linux/Makefile	2005-07-27 04:30:19 UTC (rev 413)
@@ -106,7 +106,7 @@
 # Configure commands below \/
 #==============================================================================
 	@patch -Np1 -i ../$(PATCH2)
-	@CC="klcc" LDFLAGS="-shared" ./configure >> $(DIR)-$@.log 2>&1
+	@CC="klcc" LDFLAGS="-shared" ./configure >../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================
 #
@@ -115,8 +115,8 @@
 #==============================================================================
 # Make commands below \/
 #==============================================================================
-	@make lib/xstrncpy.o lib/getpass.o >> $(DIR)-$@.log 2>&1
-	@make -C mount losetup >> $(DIR)-$@.log 2>&1
+	@make lib/xstrncpy.o lib/getpass.o >>../$(DIR)-$@.log 2>&1
+	@make -C mount losetup >>../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================
 #
@@ -135,4 +135,4 @@
 clean:
 	@-rm -rf $(DIR)
 
-.PHONY: compile-stage1 clean chroot compile-stage2
+.PHONY: compile-stage1 clean chroot compile-stage2 compile-klibc-losetup




More information about the livecd mailing list