From 2f82f7858997bc47948d874492e8f19f14f12a65 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Sat, 18 Nov 2017 19:05:40 +0000
Subject: [PATCH] build without sdl for travis

---
 .travis.yml | 7 ++++++-
 build       | 8 ++++++--
 configure   | 6 ++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0838ac3..8ac1ea5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,5 +20,10 @@ script: |
   # awk: without it, too much stdout (4Mb max)
   # If we ignore stdout: Travis kills job because it spent
   # too long without any new stdout.
-  bash -x ./build -j 16 |& awk 'NR % 1000 == 0'
+  #
+  # -S otherwise apt-get instlal fails with:
+  # The following packages have unmet dependencies:
+  # libsdl2-dev : Depends: libegl1-mesa-dev
+  #            Depends: libgles2-mesa-dev
+  bash -x ./build -j 16 -S |& awk 'NR % 1000 == 0'
   bash -x ./run -e 'init=/poweroff.out' -n
diff --git a/build b/build
index b7c8356..b2bed12 100755
--- a/build
+++ b/build
@@ -2,10 +2,11 @@
 set -e
 arch=x86_64
 extra_targets=''
+qemu_sdl='--enable-sdl --with-sdlabi=2.0'
 j="$(($(nproc) - 2))"
 x11=false
 v=0
-while getopts 'a:e:j:nt:v' OPT; do
+while getopts 'a:e:j:nSt:v' OPT; do
   case "$OPT" in
     a)
       arch="$OPTARG"
@@ -13,6 +14,9 @@ while getopts 'a:e:j:nt:v' OPT; do
     j)
       j="$OPTARG"
     ;;
+    S)
+      qemu_sdl=''
+    ;;
     t)
       extra_targets="$extra_args $OPTARG"
     ;;
@@ -67,7 +71,7 @@ time \
   make \
   O="$outdir" \
   BR2_JLEVEL="$j" \
-  HOST_QEMU_OPTS="--enable-debug --enable-sdl --extra-cflags='-DDEBUG_PL061=1' --with-sdlabi=2.0 --enable-trace-backends=simple" \
+  HOST_QEMU_OPTS="--enable-debug --extra-cflags='-DDEBUG_PL061=1' --enable-trace-backends=simple $qemu_sdl" \
   V="$v" \
   kernel_module-rebuild \
   $extra_targets \
diff --git a/configure b/configure
index ca4fecb..d4494eb 100755
--- a/configure
+++ b/configure
@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
-set -ex
+set -e
+interactive_pkgs=libsdl2-dev
 y=''
 while getopts t OPT; do
   case "$OPT" in
     t)
+      interactive_pkgs=''
       y='-y'
       ;;
   esac
@@ -21,6 +23,6 @@ sudo apt-get update $y
 sudo apt-get install $y \
   build-essential \
   coreutils \
-  libsdl2-dev \
+  $interactive_pkgs \
 ;
 sudo apt-get build-dep $y qemu