From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 26 Aug 2008 18:40:51 +0000 (+0200)
Subject: Removed openssl from installation system.
X-Git-Tag: v3.0-alpha1~733^2~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4e5407cc6811ecd3b2df5805dff45126e3afbb7;p=ipfire-3.x.git

Removed openssl from installation system.
---

diff --git a/lfs/openssl b/lfs/openssl
index 2ae2f3a06..cca829feb 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -57,7 +57,6 @@ $(TARGET) :
 
 	cd $(DIR_APP) && sed -i -e 's/-march=i486/-march=$(MACHINE)/' Configure
 
-ifeq "$(STAGE)" "$(SNAME)"
 	cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' Configure
 
 	cd $(DIR_APP) && sed -e 's/__OpenBSD__/__linux__/' -e 's/arandom/urandom/' \
@@ -80,27 +79,6 @@ ifeq "$(STAGE)" "$(SNAME)"
 
 	mv -v /usr/lib/{libcrypto,libssl}.a /usr/lib/static
 	install -m 0644 $(DIR_SRC)/config/ssl/openssl.cnf /etc/ssl
-endif
-
-ifeq "$(STAGE)" "installer"
-	cd $(DIR_APP) && sed -i -e 's/-O3/-Os/' Configure
-
-	cd $(DIR_APP) && $(U_TOOLS) \
-		./Configure linux-elf \
-			--prefix=/usr \
-			--openssldir=/etc/ssl \
-			-L$(INSTALLER_DIR)/lib \
-			-L$(INSTALLER_DIR)/usr/lib \
-			-ldl \
-			-I$(INSTALLER_DIR)/usr/include threads \
-			shared no-idea no-md2 no-mdc2 no-rc2 no-rc5 no-sha0 no-smime \
-			no-rmd160 no-aes192 no-ripemd no-camellia no-ans1 no-krb5 no-idea \
-			zlib-dynamic no-engines no-ec no-err no-fips no-hw zlib-dynamic \
-			no-sse2 no-perlasm \
-			-DOPENSSL_SMALL_FOOTPRINT
-	cd $(DIR_APP) && make CC=$(U_CC) AR="$(U_AR) r" RANLIB=$(U_RANLIB)
-	cd $(DIR_APP) && make CC=$(U_CC) install INSTALL_PREFIX=$(INSTALLER_DIR)
-endif
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)