r458 - x86/trunk/packages/readline

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Aug 1 08:59:16 PDT 2005


Author: thomasp
Date: 2005-08-01 09:59:15 -0600 (Mon, 01 Aug 2005)
New Revision: 458

Modified:
   x86/trunk/packages/readline/Makefile
Log:
Updated readline Makefile

Modified: x86/trunk/packages/readline/Makefile
===================================================================
--- x86/trunk/packages/readline/Makefile	2005-08-01 15:59:05 UTC (rev 457)
+++ x86/trunk/packages/readline/Makefile	2005-08-01 15:59:15 UTC (rev 458)
@@ -1,37 +1,66 @@
 # Readline Makefile
+#==============================================================================
 
-# Package versions
 NM= readline
 VRS= 5.0
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-PATCH= $(DIR)-fixes-1.patch
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 6df316629de417c16a77a444cc456a3ba949951b
 
-# RULES
+PATCH1= $(DIR)-fixes-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 9866094fcb9cedf702744b177d19d4fa0079c9c9
 
-.PHONY: clean chroot stage2
+# Targets
+# =============================================================================
 
+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/lib/libreadline.so ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i $(SRC)/$(PATCH) && \
-	 ./configure --prefix=/usr && \
-	 make -j3 SHLIB_XLDFLAGS=-lncurses && make install && chmod 755 /usr/lib/*.5.0 && \
-	 mv /usr/lib/lib{readline,history}.so.5* /lib && \
-	 ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so && \
-	 ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so ; 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)
+	@./configure --prefix=/usr --libdir=/lib >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) SHLIB_XLDFLAGS=-lncurses >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+	@chmod 755 /lib/lib{readline,history}.so*
+	@rm /lib/lib{readline,history}.so
+	@ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
+	@ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list