From c86f62eac983fc0e26b3c451640b559833634722 Mon Sep 17 00:00:00 2001
From: praingeard <paul.raingeard@gmail.com>
Date: Sat, 15 Jun 2019 10:24:06 +0200
Subject: [PATCH 1/2] fix travis for osx

---
 .travis.yml | 29 ++++++++++++++++++++++++-----
 Makefile    |  4 ++--
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 857c5d6..ae6bf63 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,16 +23,21 @@ 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
+  - echo ${TRAVIS_OS_NAME}
+  - if [ "${TRAVIS_OS_NAME}" == "osx" ];
+    then 
+      export CC=gcc-8;
+      export CXX=g++-8;
+      travis_wait 60 gmake all -j3;
+    else
+      travis_wait 60 make all -j3;
+    fi
  - tar czf amiga-gcc-${TRAVIS_OS_NAME}.tgz /opt/amiga
  - ls -l
 before_deploy:
@@ -37,3 +54,5 @@ deploy:
   overwrite: true
   on:
     tags: true
+after_failure:
+  - cat log/*.log
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 4558227..59cb80c 100644
--- a/Makefile
+++ b/Makefile
@@ -609,11 +609,11 @@ $(BUILD)/vbcc_target_m68k-amigaos/_done: $(BUILD)/vbcc_target_m68k-amigaos.info
 
 
 $(BUILD)/vbcc_target_m68k-amigaos.info: download/vbcc_target_m68k-amigaos.lha $(BUILD)/_lha_done
-	$(L0)"unpack vbcc_target_m68k-amigaos"$(L1) cd $(BUILD) && lha xf ../download/vbcc_target_m68k-amigaos.lha $(L2)
+	$(L0)"unpack vbcc_target_m68k-amigaos"$(L1) cd $(BUILD) && lha xf ../download/vbcc_target_m68k-amiga.lha $(L2)
 	@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 $(L2)
 
 # =================================================
 # L I B R A R I E S

From 078a2ccb3eaa735bc4adfd8db1bb2cd5c9332937 Mon Sep 17 00:00:00 2001
From: "Stefan \"Bebbo\" Franke" <bebbo@bejy.net>
Date: Sat, 15 Jun 2019 10:57:15 +0200
Subject: [PATCH 2/2] Update Makefile

there are more locations which would need a fix. So the most convenient way is to keep the name and set it in the `wget`command with  `-o`
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0cd26e9..8a3af39 100644
--- a/Makefile
+++ b/Makefile
@@ -609,7 +609,7 @@ $(BUILD)/vbcc_target_m68k-amigaos/_done: $(BUILD)/vbcc_target_m68k-amigaos.info
 
 
 $(BUILD)/vbcc_target_m68k-amigaos.info: download/vbcc_target_m68k-amigaos.lha $(BUILD)/_lha_done
-	$(L0)"unpack vbcc_target_m68k-amigaos"$(L1) cd $(BUILD) && lha xf ../download/vbcc_target_m68k-amiga.lha $(L2)
+	$(L0)"unpack vbcc_target_m68k-amigaos"$(L1) cd $(BUILD) && lha xf ../download/vbcc_target_m68k-amigaos.lha $(L2)
 	@touch $(BUILD)/vbcc_target_m68k-amigaos.info
 
 download/vbcc_target_m68k-amigaos.lha: