From e0e5e5cf09169720d086d73443f388ac7c6f6d76 Mon Sep 17 00:00:00 2001
From: bebbo <bebbo@bejy.net>
Date: Sat, 15 Jun 2019 09:16:54 +0200
Subject: [PATCH 1/4] use aminet instead of server.owl

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4558227..8a3af39 100644
--- a/Makefile
+++ b/Makefile
@@ -613,7 +613,7 @@ $(BUILD)/vbcc_target_m68k-amigaos.info: download/vbcc_target_m68k-amigaos.lha $(
 	@touch $(BUILD)/vbcc_target_m68k-amigaos.info
 
 download/vbcc_target_m68k-amigaos.lha:
-	$(L0)"downloading vbcc_target"$(L1) cd download && wget http://server.owl.de/~frank/vbcc/2017-08-14/vbcc_target_m68k-amigaos.lha $(L2)
+	$(L0)"downloading vbcc_target"$(L1) cd download && wget http://aminet.net/dev/c/vbcc_target_m68k-amiga.lha -O vbcc_target_m68k-amigaos.lha $(L2)
 
 # =================================================
 # L I B R A R I E S

From 4f5e995ba72b4b8b6e8790cdc8819c99d17b3be9 Mon Sep 17 00:00:00 2001
From: bebbo <bebbo@bejy.net>
Date: Sat, 15 Jun 2019 10:13:48 +0200
Subject: [PATCH 2/4] fix travis-ci for osx (3)

---
 .travis.yml | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 857c5d6..e8b0f22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,18 @@
 branches:
   only:
   - master
+addons:
+  homebrew:
+    taps: discoteq/discoteq
+    packages:
+      - bash
+      - make
+      - lhasa
+      - flex
+      - gettext
+      - texinfo
+      - flock
+      # needed but already installed : gcc autoconf wget gmp mpfr libmpc
 matrix:
   include:
     - os: linux
@@ -11,18 +23,24 @@ matrix:
         - sudo apt-get install -y make git gcc g++ lhasa libgmp-dev libmpfr-dev libmpc-dev flex gettext texinfo
         - sudo mkdir /opt/amiga && sudo chown $(whoami) /opt/amiga
     - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode10.2
       sudo: required
       language: c
       before_install:
-        - brew install libmpc util-linux gcc
-        - brew tap discoteq/discoteq; brew install flock
         - sudo mkdir /opt/amiga && sudo chown $(whoami) /opt/amiga
 script:
- - echo ${TRAVIS_OS_NAME}
- - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then CC=gcc-9 CXX=g++-9 make all -j3; else make all -j3; fi
+ - if [ "${TRAVIS_OS_NAME}" == "osx" ];
+   then
+     export CC=gcc-8;
+     export CXX=g++-8;
+     gmake all -j3;
+   else
+     make all -j3;
+   fi
  - tar czf amiga-gcc-${TRAVIS_OS_NAME}.tgz /opt/amiga
  - ls -l
+after_failure:
+  - cat log/*.log
 before_deploy:
  - git config --local user.name "bebbo@travis-ci"
  - git config --local user.email "bebbo@bejy.net"

From ee1e8f1c9fb2698b6128d0fdcc65d398e4cf794d Mon Sep 17 00:00:00 2001
From: bebbo <bebbo@bejy.net>
Date: Sat, 15 Jun 2019 10:38:18 +0200
Subject: [PATCH 3/4] fix travis-ci for osx (4)

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e8b0f22..284c696 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ script:
    then
      export CC=gcc-8;
      export CXX=g++-8;
-     gmake all -j3;
+     (gmake -j3 all &); while [ ! -f $(realpath build-Darwin/gcc/_libgcc_done) ]; do date; sleep 60; done;
    else
      make all -j3;
    fi

From 6ab5b7e0f2c4ab8c289d6fa36ec9ae8f9b4df1cc Mon Sep 17 00:00:00 2001
From: bebbo <bebbo@bejy.net>
Date: Sat, 15 Jun 2019 10:43:22 +0200
Subject: [PATCH 4/4] fix travis-ci for osx (5)

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 284c696..5b7cb4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ script:
    then
      export CC=gcc-8;
      export CXX=g++-8;
-     (gmake -j3 all &); while [ ! -f $(realpath build-Darwin/gcc/_libgcc_done) ]; do date; sleep 60; done;
+     (gmake -j3 all &); while [ ! -f $(realpath build-Darwin)/gcc/_libgcc_done ]; do date; sleep 60; done;
    else
      make all -j3;
    fi