From 2531ac9a450842154c8d0a8ae5fdaf3f950ef85c Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Wed, 16 Dec 2015 22:39:50 -0800 Subject: Test overhaul + add an arm cross compile build The ARM build doesn't do anything yet --- openssl/test/build.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'openssl/test/build.sh') diff --git a/openssl/test/build.sh b/openssl/test/build.sh index 9b336b77..2cbfb61a 100755 --- a/openssl/test/build.sh +++ b/openssl/test/build.sh @@ -1,6 +1,10 @@ #!/bin/bash set -e +if [ $TRAVIS_OS_NAME -eq "osx" ]; then + exit 0 +fi + mkdir /tmp/openssl cd /tmp/openssl curl https://openssl.org/source/openssl-1.0.2e.tar.gz | tar --strip-components=1 -xzf - -- cgit v1.2.3 From e7744874f46e702a24f1e26e7aeaf54af843c281 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Wed, 16 Dec 2015 23:25:19 -0800 Subject: Try cross compiling --- openssl/test/build.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'openssl/test/build.sh') diff --git a/openssl/test/build.sh b/openssl/test/build.sh index 2cbfb61a..b901d29e 100755 --- a/openssl/test/build.sh +++ b/openssl/test/build.sh @@ -1,13 +1,17 @@ #!/bin/bash set -e -if [ $TRAVIS_OS_NAME -eq "osx" ]; then +if [ $TRAVIS_OS_NAME == "osx" ]; then exit 0 fi +if [ $TARGET != "" ]; then + FLAGS="os/compiler=$TARGET-" +fi + mkdir /tmp/openssl cd /tmp/openssl curl https://openssl.org/source/openssl-1.0.2e.tar.gz | tar --strip-components=1 -xzf - -./config --prefix=$HOME/openssl shared +./config --prefix=$HOME/openssl shared $FLAGS make make install -- cgit v1.2.3 From ccab187f5aa987d1c91bdbdef891e0d841ec1afd Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Wed, 16 Dec 2015 23:47:18 -0800 Subject: Travis fixes --- openssl/test/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'openssl/test/build.sh') diff --git a/openssl/test/build.sh b/openssl/test/build.sh index b901d29e..a10cd8ad 100755 --- a/openssl/test/build.sh +++ b/openssl/test/build.sh @@ -1,17 +1,17 @@ #!/bin/bash set -e -if [ $TRAVIS_OS_NAME == "osx" ]; then +if [ "$TRAVIS_OS_NAME" == "osx" ]; then exit 0 fi -if [ $TARGET != "" ]; then +if [ -n "$TARGET" ]; then FLAGS="os/compiler=$TARGET-" fi mkdir /tmp/openssl cd /tmp/openssl curl https://openssl.org/source/openssl-1.0.2e.tar.gz | tar --strip-components=1 -xzf - -./config --prefix=$HOME/openssl shared $FLAGS +./Configure --prefix=$HOME/openssl shared $FLAGS make make install -- cgit v1.2.3 From e077ed0b4d3c87fb38d2d9536f669cf569b69234 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Thu, 17 Dec 2015 20:08:44 -0800 Subject: Disable cross compilation for now --- openssl/test/build.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'openssl/test/build.sh') diff --git a/openssl/test/build.sh b/openssl/test/build.sh index a10cd8ad..f52ded60 100755 --- a/openssl/test/build.sh +++ b/openssl/test/build.sh @@ -5,13 +5,17 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then exit 0 fi -if [ -n "$TARGET" ]; then - FLAGS="os/compiler=$TARGET-" +if [ "$TARGET" == "arm-unknown-linux-gnueabihf" ]; then + export C_INCLUDE_PATH=/usr/arm-linux-gnueabihf/include + CROSS=arm-linux-gnueabihf- + OS_COMPILER=linux-armv4 +else + OS_COMPILER=linux-x86_64 fi mkdir /tmp/openssl cd /tmp/openssl curl https://openssl.org/source/openssl-1.0.2e.tar.gz | tar --strip-components=1 -xzf - -./Configure --prefix=$HOME/openssl shared $FLAGS +./Configure --prefix=$HOME/openssl shared --cross-compile-prefix=$CROSS $OS_COMPILER make make install -- cgit v1.2.3