r461 - in x86/trunk/packages: flex groff

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Aug 1 11:18:19 PDT 2005


Author: thomasp
Date: 2005-08-01 12:18:17 -0600 (Mon, 01 Aug 2005)
New Revision: 461

Modified:
   x86/trunk/packages/flex/Makefile
   x86/trunk/packages/groff/Makefile
Log:
Updated flex Makefile, added missing copy of source files to LFSSRC in groff

Modified: x86/trunk/packages/flex/Makefile
===================================================================
--- x86/trunk/packages/flex/Makefile	2005-08-01 18:09:03 UTC (rev 460)
+++ x86/trunk/packages/flex/Makefile	2005-08-01 18:18:17 UTC (rev 461)
@@ -1,54 +1,73 @@
 # Flex Makefile
+#==============================================================================
 
-# Package versions
 NM= flex
 VRS= 2.5.31
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-PATCH= $(DIR)-debian_fixes-3.patch
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= c305d08a469625658418cb8f2d66c66fce1b76e5
 
-# RULES
+PATCH1= $(DIR)-debian_fixes-3.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= aafb7a09fa8ffe4d3db0737df6ac39d26f93e072
 
-.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 [ ! -f $(WD)/bin/flex ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Z -Np1 -i $(SRC)/$(PATCH) && touch doc/flex.1 && \
-	 ./configure --prefix=$(WD) && make -j3 && make install ; fi
-	@make clean
+include $(ROOT)/scripts/functions
 
 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 $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \
-	 mv $(PATCH) $(SRC) ; fi
-	@if [ ! -f /usr/bin/flex ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Z -Np1 -i $(SRC)/$(PATCH) && touch doc/flex.1 && \
-	 ./configure --prefix=/usr && make -j3 && make install && \
-	 ln -sf libfl.a /usr/lib/libl.a && \
-	 echo "#!/bin/sh" > /usr/bin/lex && \
-	 echo "# Begin /usr/bin/lex" >> /usr/bin/lex && \
-	 echo "" >> /usr/bin/lex && \
-	 echo "exec /usr/bin/flex -l \"\$$@\"" >> /usr/bin/lex && \
-	 echo "" >> /usr/bin/lex && \
-	 echo "# End /usr/bin/lex" >> /usr/bin/lex && \
-	 chmod 755 /usr/bin/lex ; fi
-	@make clean
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
+	@cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
+
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
+	@touch doc/flex.1
+	@./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
+	@ln -s libfl.a /usr/lib/libl.a
 	
+	@echo "#!/bin/sh" > /usr/bin/lex
+	@echo "# Begin /usr/bin/lex" >> /usr/bin/lex
+	@echo "" >> /usr/bin/lex
+	@echo "exec /usr/bin/flex -l \"$$@\"" >> /usr/bin/lex
+	@echo "" >> /usr/bin/lex
+	@echo "# End /usr/bin/lex" >> /usr/bin/lex
+	@chmod 755 /usr/bin/lex
+
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/groff/Makefile
===================================================================
--- x86/trunk/packages/groff/Makefile	2005-08-01 18:09:03 UTC (rev 460)
+++ x86/trunk/packages/groff/Makefile	2005-08-01 18:18:17 UTC (rev 461)
@@ -5,7 +5,7 @@
 VRS= 1.19.1
 DIR= $(NM)-$(VRS)
 
-FILE= $(DIR).tar.bz2 #
+FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= d02bf99ff272ebcedc61961323a5279e77d8a191
 
@@ -20,6 +20,7 @@
 
 stage2: Makefile $(FILE) 
 	@$(std_build)
+	@cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-stage2:
 	@$(call echo_message, Configuring)




More information about the livecd mailing list