From db318d1bacf2126f715e7919e8e95d08257ca76f Mon Sep 17 00:00:00 2001
From: Stefan Eissing <stefan.eissing@greenbytes.de>
Date: Mon, 22 Jun 2015 13:50:12 +0200
Subject: [PATCH] support for building openssl on 32bit archs

---
 sandbox/httpd/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sandbox/httpd/Makefile b/sandbox/httpd/Makefile
index 7d699f1a..6ddc706a 100644
--- a/sandbox/httpd/Makefile
+++ b/sandbox/httpd/Makefile
@@ -14,6 +14,9 @@
 #
 
 
+OS           = $(shell uname -s)
+MACHINE      = $(shell uname -m)
+
 
 APR_VERSION  = 1.5.2
 APR_DIR      = apr-$(APR_VERSION)
@@ -40,7 +43,7 @@ OPENSSL_DIR = openssl-latest
 OPENSSL_TAR = $(OPENSSL_DIR).tar.gz
 OPENSSL_URL = $(OPENSSL_BASE)/source/latest.tar.gz
 OPENSSL_CONF_CMD = CFLAGS=-fPIC ./Configure
-OPENSSL_CONF =  shared linux-generic32
+OPENSSL_CONF =  shared linux-$(MACHINE)
 
 FCGI_VERSION = 2.3.9
 FCGI_DIR     = mod_fcgid-$(FCGI_VERSION)
@@ -53,8 +56,6 @@ BLD_PREFIX   = $(shell dirname $$PWD)/install
 
 CURL_OPTS    = --progress-bar
 
-OS           = $(shell uname -s)
-
 HTTPD_CONF   = --enable-mpms-shared=all --with-included-apr
 HTTPD_DEPS   = $(GEN)/$(HTTPD_DIR)/.apr-extracted
 
@@ -69,6 +70,9 @@ ifeq ($(OS),Darwin)
 	HTTPD_DEPS  += $(INST_DIR)/.pcre-installed
 	HTTPD_CONF  += --with-pcre=$(BLD_PREFIX)
 endif
+ifeq ($(MACHINE),i686)
+    OPENSSL_CONF =  shared linux-generic32
+endif
 
 OPENSSL_VERSION = $(shell openssl version -v | sed -e 's/OpenSSL *//g' -e 's/[a-z]* .*//g')