r384 - in x86/trunk/packages: expect tcl

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Jul 19 13:29:33 PDT 2005


Author: jhuntwork
Date: 2005-07-19 14:29:32 -0600 (Tue, 19 Jul 2005)
New Revision: 384

Modified:
   x86/trunk/packages/expect/Makefile
   x86/trunk/packages/tcl/Makefile
Log:
Update to tcl, expect

Modified: x86/trunk/packages/expect/Makefile
===================================================================
--- x86/trunk/packages/expect/Makefile	2005-07-19 11:38:49 UTC (rev 383)
+++ x86/trunk/packages/expect/Makefile	2005-07-19 20:29:32 UTC (rev 384)
@@ -1,32 +1,61 @@
 # Expect Makefile
+#==============================================================================
 
-# Package versions
 NM= expect
 VRS= 5.43.0
 DIR= $(NM)-5.43
+
 FILE= $(NM)-$(VRS).tar.bz2
-PATCH= $(NM)-$(VRS)-spawn-1.patch
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 
 
-# RULES
+PATCH1= $(NM)-$(VRS)-spawn-1.patch
+URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 
 
-.PHONY: stage1 clean
+# 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/expect ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i $(SRC)/$(PATCH) && \
-	 ./configure --prefix=$(WD) --with-tcl=$(WD)/lib --with-tclinclude=../../tcl/tcl8.4.9 --with-x=no && \
-	 make -j3 && make SCRIPTS="" install ; fi
-	@make clean
+include $(ROOT)/scripts/functions
+
+stage1: $(FILE) $(PATCH1)
+	@$(std_build)
+	@cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
 	@make -C ../tcl clean
 
+compile-stage1:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
+	@./configure --prefix=$(WD) --with-tcl=$(WD)/lib \
+	--with-tclinclude=$(ROOT)/$(PKG)/tcl/tcl8.4.9 --with-x=no \
+	 >../$(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 SCRIPTS="" install >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: compile-stage1 clean chroot

Modified: x86/trunk/packages/tcl/Makefile
===================================================================
--- x86/trunk/packages/tcl/Makefile	2005-07-19 11:38:49 UTC (rev 383)
+++ x86/trunk/packages/tcl/Makefile	2005-07-19 20:29:32 UTC (rev 384)
@@ -15,7 +15,9 @@
 include $(ROOT)/scripts/functions
 
 stage1: $(FILE)
-	@$(std_build)
+        @unpack $(FILE)
+        @make -C $(DIR) -f ../Makefile compile-$@
+        @touch $@
 	@cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-stage1:




More information about the livecd mailing list