From 74cb6d5e1e7795740990d28a40f89a04bfde8fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Mon, 8 Jul 2013 10:16:25 +0000
Subject: main/openssl: support crosscompiling, arm and musl

---
 main/openssl/APKBUILD                  | 26 ++++++++++++++++++++++++--
 main/openssl/openssl-use-termios.patch | 12 ++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 main/openssl/openssl-use-termios.patch

(limited to 'main/openssl')

diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD
index f0dfc3f085..f9cd11cc02 100644
--- a/main/openssl/APKBUILD
+++ b/main/openssl/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openssl
 pkgver=1.0.1e
-pkgrel=2
+pkgrel=3
 pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
 url="http://openssl.org"
 depends=
@@ -21,6 +21,7 @@ source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz
 	0004-crypto-engine-autoload-padlock-dynamic-engine.patch
 	0005-s_client-ircv3-starttls.patch
 	openssl-1.0.1-version-eglibc.patch
+	openssl-use-termios.patch
 	fix-default-apps-capath.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -53,8 +54,26 @@ prepare() {
 }
 
 build() {
+	local _target
 	cd "$_builddir"
-	./config --prefix=/usr \
+
+	# openssl will prepend crosscompile always core CC et al
+	CC=${CC#${CROSS_COMPILE}}
+	CXX=${CXX#${CROSS_COMPILE}}
+	CPP=${CPP#${CROSS_COMPILE}}
+
+	# determine target OS for openssl
+	case "$CARCH" in
+	x86)    _target="linux-elf" ;;
+	x86_64) _target="linux-x86_64" ;;
+	arm*)   _target="linux-armv4" ;;
+	esac
+
+	# Configure assumes --options are for it, so can't use
+	# gcc's --sysroot fake this by overriding CC
+	[ -n "$CBUILDROOT" ] && CC="$CC --sysroot=${CBUILDROOT}"
+
+	./Configure $_target --prefix=/usr \
 		--libdir=lib \
 		--openssldir=/etc/ssl \
 		shared zlib enable-montasm enable-md2 \
@@ -99,6 +118,7 @@ cef4633142031b59960200e87ce3bb18  0003-engines-e_padlock-implement-sha1-sha224-s
 c32f42451a07267ee5dfb3781fa40c00  0004-crypto-engine-autoload-padlock-dynamic-engine.patch
 c5b1042a3acaf3591f3f5620b7086e12  0005-s_client-ircv3-starttls.patch
 d1f3aaad7c36590f21355682983cd14e  openssl-1.0.1-version-eglibc.patch
+2681796363085d01db8a81c249cd2d7b  openssl-use-termios.patch
 efec1bce615256961b1756e575ee1d0a  fix-default-apps-capath.patch"
 sha256sums="f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3  openssl-1.0.1e.tar.gz
 fe844e21b2c42da2d8e9c89350211d70c0829f45532b89b7e492bfde589ee7ed  fix-manpages.patch
@@ -109,6 +129,7 @@ cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b  0003-engines-e
 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f  0004-crypto-engine-autoload-padlock-dynamic-engine.patch
 44b553d92e33c48f854a8e15b23830375bc400e987505c74956ac196266f0d46  0005-s_client-ircv3-starttls.patch
 51146851d8454dcb73138f794ced8bd629658b4a0524c466f61b653fff536c93  openssl-1.0.1-version-eglibc.patch
+05266a671143cf17367dee8d409ad6d0857201392c99731d7ebb8f8cdcdc32f7  openssl-use-termios.patch
 1e11d6b8cdcdd6957c69d33ab670c5918fc96c12fdb9b76b4287cb8f69c3545d  fix-default-apps-capath.patch"
 sha512sums="c76857e439431b2ef6f2aa123997e53f82b9c3c964d4d765d7cc6c0c20b37a21adf578f9b759b2b65ae3925454c432a01b7de0cd320ece7181dc292e00d3244e  openssl-1.0.1e.tar.gz
 880411d56da49946d24328445728367e0bf13b0fd47954971514bee8cd5613a038ad8aeaf68da2c92f4634deb022febd7b3e37f9bbfc5d2c9c8b3b5ffd971407  fix-manpages.patch
@@ -119,4 +140,5 @@ b019320869d215014ad46e0b29aa239e31243571c4d45256b3ce6449a67fdc106a381c1cf3abd55d
 3bedc326ca3e5945bc4ec4dccfe596042ee87aaeaf90b5063110a99cc8e38584838d68289907e4a3fcdb8e04635052ad0759c94e1d7070bb317c2066e2506bbe  0004-crypto-engine-autoload-padlock-dynamic-engine.patch
 70cd257bbd5a86685dc2508399e67746b60ed5d581eb84fe4d4fc6af214f31b71e2a58ad758d572976a61f67bf64c37a935a9788db160f75bced75397b9bcce3  0005-s_client-ircv3-starttls.patch
 6db9d9ee62048d27f80e392eda99a46712ee85f1c8fd49f4931be73c880da8b84844a72657f7bceddb7db0026daddd31870d9c5065494f8d359ee8560284fd4a  openssl-1.0.1-version-eglibc.patch
+22261ad902ad4826db889fa0e6196b57d6cb389c1707f5827ba48a4630097e590979257f16f4a36fe611199fa33ba32d5f412c8b93beb84001865c2501b288da  openssl-use-termios.patch
 f2e737146a473d55b99f27457718ca299a02a0c74009026a30c3d1347c575bc264962b5708995e02ef7d68521b8366ccea7320523efb87b1ab2632d73fec5658  fix-default-apps-capath.patch"
diff --git a/main/openssl/openssl-use-termios.patch b/main/openssl/openssl-use-termios.patch
new file mode 100644
index 0000000000..7fde174eb5
--- /dev/null
+++ b/main/openssl/openssl-use-termios.patch
@@ -0,0 +1,12 @@
+--- a/crypto/ui/ui_openssl.c	Fri Sep 21 09:57:09 2012
++++ b/crypto/ui/ui_openssl.c	Fri Sep 21 09:57:30 2012
+@@ -212,6 +212,9 @@
+ #undef SGTTY
+ #endif
+ 
++#define TERMIOS
++#undef TERMIO
++
+ #ifdef TERMIOS
+ # include <termios.h>
+ # define TTY_STRUCT		struct termios
-- 
cgit v1.2.3