From 48b15417a6758da5941625220485804983cfc24b Mon Sep 17 00:00:00 2001
From: Ralph Lange <ralph.lange@gmx.de>
Date: Fri, 24 Apr 2020 19:12:20 +0200
Subject: [PATCH] travis: fix RTEMS cross builds for Base 3.15

---
 travis/build.sh   | 5 ++++-
 travis/prepare.sh | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/travis/build.sh b/travis/build.sh
index b46e869..f76203f 100755
--- a/travis/build.sh
+++ b/travis/build.sh
@@ -13,6 +13,9 @@ export EPICS_BASE
 [ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/startup/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/startup/EpicsHostArch.pl)
 export EPICS_HOST_ARCH
 
+# Base 3.15 doesn't have -qemu target architecture and needs an extra define
+[ -e $EPICS_BASE/configure/os/CONFIG.Common.RTEMS-pc386-qemu ] || EXTRA_QEMU=RTEMS_QEMU_FIXUPS=YES
+
 # use array variable to get the quoting right while using separate words for arguments
 [ -n "$EXTRA0" ] && EXTRA[0]="$EXTRA0"
 [ -n "$EXTRA1" ] && EXTRA[1]="$EXTRA1"
@@ -21,7 +24,7 @@ export EPICS_HOST_ARCH
 [ -n "$EXTRA4" ] && EXTRA[4]="$EXTRA4"
 [ -n "$EXTRA5" ] && EXTRA[5]="$EXTRA5"
 
-make -j2 "${EXTRA[@]}"
+make -j2 $EXTRA_QEMU "${EXTRA[@]}"
 
 ret=0
 
diff --git a/travis/prepare.sh b/travis/prepare.sh
index ca0e172..aab32eb 100755
--- a/travis/prepare.sh
+++ b/travis/prepare.sh
@@ -183,8 +183,10 @@ EOF
 RTEMS_VERSION=$RTEMS
 RTEMS_BASE=$HOME/.rtems
 EOF
+    # Base 3.15 doesn't have -qemu target architecture
+    [ -e $EPICS_BASE/configure/os/CONFIG.Common.RTEMS-pc386-qemu ] && QEMU=-qemu
     cat << EOF >> $EPICS_BASE/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu
+CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386$QEMU
 EOF
   fi