From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 18 Jun 2012 23:54:08 +0000 (+0000)
Subject: openssl does not compile with uml and arch x86_64
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c2b78f87d9e220f688810374e96a536f2d71e1fc;p=openwrt%2Fstaging%2Fyousong.git

openssl does not compile with uml and arch x86_64

Hi,

I found that openssl did not compile on the uml target under x86_64. The
attached patch should
correct this and is working for me. Is this the right way to do it?

thanks,
Thomas

SVN-Revision: 32443
---

diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index a696dd7cd4..7043aeeb18 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -82,11 +82,16 @@ else
   OPENSSL_OPTIONS += no-engines
 endif
 
-OPENSSL_OPTIONS += no-perlasm
+ifeq ($(CONFIG_x86_64),y)
+  OPENSSL_TARGET:=linux-x86_64
+else
+  OPENSSL_TARGET:=linux-openwrt
+  OPENSSL_OPTIONS+=no-perlasm no-sse2
+endif
 
 define Build/Configure
 	(cd $(PKG_BUILD_DIR); \
-		./Configure linux-openwrt \
+		./Configure $(OPENSSL_TARGET) \
 			--prefix=/usr \
 			--openssldir=/etc/ssl \
 			$(TARGET_CPPFLAGS) \