summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Green <green@moxielogic.com>2019-10-14 08:35:25 -0400
committerAnthony Green <green@moxielogic.com>2019-10-14 08:35:25 -0400
commit09c263356f2758c4fdc6bf026b194221b5765a58 (patch)
tree2e7b4e3d68523d4a9d3b35cc94fcda1c6daf13b6
parent0849e4483d2d00ffd155984c65169c8e2f10e1d5 (diff)
downloadlibffi-09c263356f2758c4fdc6bf026b194221b5765a58.tar.gz
Build and test for s390x-linux-gnu
-rw-r--r--.travis.yml2
-rwxr-xr-x.travis/build-in-container.sh2
-rwxr-xr-x.travis/build.sh7
-rwxr-xr-x.travis/install.sh4
4 files changed, 9 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 274545b..1ba533f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ matrix:
- os: linux
env: HOST=arm32v7-linux-gnu
- os: linux
+ env: HOST=s390x-linux-gnu
+ - os: linux
compiler: gcc
env: HOST=i386-pc-linux-gnu MEVAL='export CC="$CC -m32" && CXX="$CXX -m32"'
- os: linux
diff --git a/.travis/build-in-container.sh b/.travis/build-in-container.sh
index db473fc..0de1ac9 100755
--- a/.travis/build-in-container.sh
+++ b/.travis/build-in-container.sh
@@ -6,7 +6,7 @@
cd /opt
apt-get update
-apt-get install -y gcc dejagnu make texinfo sharutils gzip
+apt-get install -y gcc dejagnu make texinfo sharutils gzip git
./configure
make
make dist
diff --git a/.travis/build.sh b/.travis/build.sh
index 39e749c..33a098d 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -25,8 +25,7 @@ function build_linux()
function build_foreign_linux()
{
- ls -l /usr/bin/qemu-arm-static
- docker run --rm -t -i -v /usr/bin/qemu-arm-static:/usr/bin/qemu-arm-static -v `pwd`:/opt --rm -ti arm32v7/debian:stretch-slim /opt/.travis/build-in-container.sh
+ docker run --rm -t -i -v /usr/bin/qemu-$1-static:/usr/bin/qemu-$1-static -v `pwd`:/opt --rm -ti $2 /opt/.travis/build-in-container.sh
}
function build_ios()
@@ -45,8 +44,10 @@ case "$HOST" in
build_ios
;;
arm32v7-linux-gnu)
- build_foreign_linux
+ build_foreign_linux arm arm32v7/debian:stretch-slim
;;
+ s390x-linux-gnu)
+ build_foreign_linux s390x s390x/ubuntu
*)
build_linux
;;
diff --git a/.travis/install.sh b/.travis/install.sh
index 70a4b23..6fd673e 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -10,7 +10,7 @@ else
sudo apt-get clean # clear the cache
sudo apt-get update
case $HOST in
- arm32v7-linux-gnu)
+ arm32v7-linux-gnu | s390x-linux-gnu)
sudo apt-get install qemu-user-static
;;
i386-pc-linux-gnu)
@@ -26,7 +26,7 @@ else
;;
esac
case $HOST in
- arm32v7-linux-gnu)
+ arm32v7-linux-gnu | s390x-linux-gnu)
# don't install host tools
;;
*)