@@ -12,11 +12,11 @@ matrix:
# cross compilation builds
- os: linux
- env: DISTRO=debian:stable VARIANT=cross-compile.ppc64le TREE="out"
+ env: DISTRO=debian:stable VARIANT=cross-compile ARCH=ppc64el TREE="out"
compiler: powerpc64le-linux-gnu-gcc
- os: linux
- env: DISTRO=debian:stable VARIANT=cross-compile.aarch64 TREE="out"
+ env: DISTRO=debian:stable VARIANT=cross-compile ARCH=arm64 TREE="out"
compiler: aarch64-linux-gnu-gcc
# musl (native)
@@ -98,4 +98,4 @@ script:
- INSTALL="${INSTALL%%/*}"
- if [ ! "$TREE" ]; then TREE="in"; fi
- case $VARIANT in cross-compile*) BUILD="cross";; i386) BUILD="32";; *) BUILD="native";; esac
- - docker run -t ltp /bin/sh -c "cd travis && ./$INSTALL.sh && if [ \"$VARIANT\" ]; then ./$INSTALL.$VARIANT.sh; fi && ../build.sh -o $TREE -t $BUILD -c $CC"
+ - docker run -t ltp /bin/sh -c "cd travis && ./$INSTALL.sh && if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./$INSTALL.$VARIANT.sh; fi && ../build.sh -o $TREE -t $BUILD -c $CC"
deleted file mode 100755
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2018-2020 Petr Vorel <pvorel@suse.cz>
-set -e
-
-dpkg --add-architecture arm64
-apt update
-
-apt install -y --no-install-recommends \
- gcc-aarch64-linux-gnu \
- libc6-dev-arm64-cross \
- libtirpc-dev:arm64
deleted file mode 100755
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2018-2020 Petr Vorel <pvorel@suse.cz>
-set -e
-
-dpkg --add-architecture ppc64el
-apt update
-
-apt install -y --no-install-recommends \
- gcc-powerpc64le-linux-gnu \
- libc6-dev-ppc64el-cross \
- libtirpc-dev:ppc64el
new file mode 100755
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copyright (c) 2018-2020 Petr Vorel <pvorel@suse.cz>
+set -e
+
+if [ -z "$ARCH" ];
+ echo "missing \$ARCH!"
+ exit 1
+fi
+
+dpkg --add-architecture $ARCH
+apt update
+
+apt install -y --no-install-recommends \
+ gcc-${ARCH}-linux-gnu \
+ libc6-dev-${ARCH}-cross \
+ libtirpc-dev:${ARCH}
Signed-off-by: Petr Vorel <pvorel@suse.cz> --- .travis.yml | 6 +++--- travis/debian.cross-compile.aarch64.sh | 11 ----------- travis/debian.cross-compile.ppc64le.sh | 11 ----------- travis/debian.cross-compile.sh | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 25 deletions(-) delete mode 100755 travis/debian.cross-compile.aarch64.sh delete mode 100755 travis/debian.cross-compile.ppc64le.sh create mode 100755 travis/debian.cross-compile.sh