r534 - in x86/trunk: . packages/openssl

justin at linuxfromscratch.org justin at linuxfromscratch.org
Tue Aug 2 16:16:56 PDT 2005


Author: justin
Date: 2005-08-02 17:16:55 -0600 (Tue, 02 Aug 2005)
New Revision: 534

Modified:
   x86/trunk/packages/openssl/Makefile
   x86/trunk/todo-list
Log:
Updated openssl Makefile.

Modified: x86/trunk/packages/openssl/Makefile
===================================================================
--- x86/trunk/packages/openssl/Makefile	2005-08-02 23:15:47 UTC (rev 533)
+++ x86/trunk/packages/openssl/Makefile	2005-08-02 23:16:55 UTC (rev 534)
@@ -1,35 +1,64 @@
 # OpenSSL Makefile
+#==============================================================================
 
-# Package versions
 NM= openssl
 VRS= 0.9.7g
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
+
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/M-P/$(FILE)
+SHA-$(FILE)= d2ea2e6b63f6d34bd26b8ba32344dfdc6b5286eb
+
 PATCH1= $(DIR)-fix_manpages-1.patch
-URL= http://www.openssl.org/source/$(FILE)
-URL1= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH1)
+URL-$(PATCH1)= $(HTTPBLFS)/M-P/$(PATCH1)
+SHA-$(PATCH1)= cb1ec4af292fc381500c4a63fd470ac0ea61218d
 
-#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 $(WD)/bin/$(WGET) $(URL) ; fi
-	@if [ ! -f $(PATCH1) ] ; then $(WD)/bin/$(WGET) $(URL1) ; fi
-	@if [ ! -d /etc/ssl ] ; then unpack $(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(PATCH1) && \
-	 ./config --openssldir=/etc/ssl --prefix=/usr shared && \
-	 sed -i 's/mcpu=pentium/mtune=i486/' Configure && \
-	 sed -i 's/mcpu=pentium/mtune=i486/' Makefile && \
-	 make -j3 MANDIR=/usr/share/man && make MANDIR=/usr/share/man install && \
-	 cp -r certs /etc/ssl ; fi
-	@make clean
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH1) >../$(DIR)-$@.log 2>&1
+	@./config --openssldir=/etc/ssl --prefix=/usr shared >>../$(DIR)-$@.log 2>&1
+	@sed -i 's/mcpu=pentium/mtune=i486/' Configure
+	@sed -i 's/mcpu=pentium/mtune=i486/' Makefile
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) MANDIR=/usr/share/man >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make MANDIR=/usr/share/man install >>../$(DIR)-$@.log 2>&1
+	@cp -r certs /etc/ssl
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-02 23:15:47 UTC (rev 533)
+++ x86/trunk/todo-list	2005-08-02 23:16:55 UTC (rev 534)
@@ -3,7 +3,6 @@
 hotplug
 inputattach
 lfs-bootscripts
-openssl
 pango
 pciutils
 procps




More information about the livecd mailing list