From 6c4ee8337dff6e9b680dbff0796038948d718b5a Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Thu, 13 Feb 2014 17:16:42 +0100
Subject: ose: Fix support for crypto

To enable it you have to modify the OSESSL variable in the
ose xcomp file.
---
 xcomp/erl-xcomp-powerpc-ose5.conf | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'xcomp')

diff --git a/xcomp/erl-xcomp-powerpc-ose5.conf b/xcomp/erl-xcomp-powerpc-ose5.conf
index 63c64b1efd..4998aff80c 100644
--- a/xcomp/erl-xcomp-powerpc-ose5.conf
+++ b/xcomp/erl-xcomp-powerpc-ose5.conf
@@ -41,6 +41,7 @@ GCCVERSION="4.4.3"
 GCCROOT="${OSEROOT}/gcc_linux_powerpc_${GCCVERSION}"
 
 OSEDEBUG="yes"
+OSESSL="no"
 
 case ${GCCVERSION} in
 4.4.3)
@@ -61,6 +62,21 @@ else
 OPT_LEVEL=""
 fi
 
+if [ ${OSESSL} = "yes" ];
+then
+## If your crypto is not in OSEROOT then you have to use --with-ssl to
+## point to the correct place. Also CRYPTO_LIB_PATH has to be modified to
+## point there as well.
+CRYPTO_CONFIG_OPTION="--disable-dynamic-ssl-lib"
+CRYPTO_NIF_PATH=",$ERL_TOP/lib/crypto/priv/lib/powerpc-unknown-ose/crypto.a"
+CRYPTO_LIB_PATH="${OSEROOT}/lib/powerpc/libsslcrypto.a"
+else
+CRYPTO_CONFIG_OPTION="--without-ssl"
+CRYPTO_NIF_PATH=""
+CRYPTO_LIB_PATH=""
+fi
+
+
 ## -- Variables for `otp_build' Only -------------------------------------------
 
 ## Variables in this section are only used, when configuring Erlang/OTP for
@@ -85,11 +101,11 @@ erl_xcomp_build=guess
 #   `$ERL_TOP/erts/autoconf/config.sub $erl_xcomp_host'.
 erl_xcomp_host="powerpc-ose"
 
-disabled_apps="--without-ssl --without-erl_interface --without-os_mon --without-megaco --without-observer --without-wx --without-appmon --without-cosEvent --without-cosEventDomain --without-cosFileTransfer --without-cosNotification --without-cosProperty --without-cosTime --without-cosTransactions --without-debugger --without-dialyzer --without-edoc --without-erl_docgen --without-eunit --without-gs --without-hipe --without-ic --without-orber --without-pman --without-toolbar --without-tv --without-webtool --without-typer"
+disabled_apps="--without-erl_interface --without-os_mon --without-megaco --without-observer --without-wx --without-appmon --without-cosEvent --without-cosEventDomain --without-cosFileTransfer --without-cosNotification --without-cosProperty --without-cosTime --without-cosTransactions --without-debugger --without-dialyzer --without-edoc --without-erl_docgen --without-eunit --without-gs --without-hipe --without-ic --without-orber --without-pman --without-toolbar --without-tv --without-webtool --without-typer"
 
 # * `erl_xcomp_configure_flags' - Extra configure flags to pass to the
 #   `configure' script.
-erl_xcomp_configure_flags="--disable-kernel-poll --disable-hipe --without-termcap --without-javac --disable-dynamic-ssl-lib --disable-shared-zlib ${disabled_apps} --enable-static-nifs=$ERL_TOP/lib/asn1/priv/lib/powerpc-unknown-ose/asn1rt_nif.a"
+erl_xcomp_configure_flags="${CRYPTO_CONFIG_OPTION} --disable-kernel-poll --disable-hipe --without-termcap --without-javac ${disabled_apps} --enable-static-nifs=$ERL_TOP/lib/asn1/priv/lib/powerpc-unknown-ose/asn1rt_nif.a${CRYPTO_NIF_PATH}"
 
 ## -- Cross Compiler and Other Tools -------------------------------------------
 
@@ -134,7 +150,7 @@ LD="${GCCROOT}/bin/${GCCTARGET}-ld"
 LDFLAGS="-Wl,-ecrt0_lm -Wl,-T,${ERL_TOP}/erts/emulator/sys/ose/gcc_${GCCVERSION}_lm_ppc.lcf"
 
 # * `LIBS' - Libraries.
-LIBS="${OSEROOT}/lib/powerpc/libcrt.a ${OSEROOT}/lib/powerpc/libm.a ${GCCROOT}/lib/gcc/${GCCTARGET}/${GCCVERSION}/nof/libgcc.a"
+LIBS="${OSEROOT}/lib/powerpc/libcrt.a ${OSEROOT}/lib/powerpc/libm.a ${GCCROOT}/lib/gcc/${GCCTARGET}/${GCCVERSION}/nof/libgcc.a ${CRYPTO_LIB_PATH}"
 
 ## -- *D*ynamic *E*rlang *D*river Linking --
 
@@ -194,7 +210,7 @@ erl_xcomp_sysroot="$OSEROOT"
 #   of the cross compilation environment. If not set, this value defaults
 #   to `$erl_xcomp_sysroot', i.e., only set this value if the include system
 #   root path is not the same as the system root path.
-erl_xcomp_isysroot="$OSEROOT/include"
+#erl_xcomp_isysroot="$OSEROOT"
 
 ## -- Optional Feature, and Bug Tests ------------------------------------------
 
-- 
cgit v1.2.3