From 5d2c42d0c112ff040d77c6e7e181ec869fbef30b Mon Sep 17 00:00:00 2001
From: David Brown <github@scri.pt>
Date: Wed, 20 Jun 2018 07:17:06 -0700
Subject: [PATCH] Don't download GCC anymore, as we don't build it

---
 Makefile                                          | 7 +------
 platform/Makefile                                 | 9 +++------
 platform/source/manifests/{ => disabled}/compiler | 0
 platform/source/manifests/medic-core              | 4 ++--
 4 files changed, 6 insertions(+), 14 deletions(-)
 rename platform/source/manifests/{ => disabled}/compiler (100%)

diff --git a/Makefile b/Makefile
index 154ef0c6..b63ac632 100644
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,7 @@ all: require-root download build
 bootinit: reset-time
 	@cd platform && ${QMAKE} bootinit
 
-compiler: reset-time prepare-tree
-	@echo >&2
-	@echo "`tput bold`Building compiler`tput sgr0`" >&2 && echo >&2
-	@(cd platform && ${QMAKE} compiler)
-
-compile-only: reset-time prepare-tree compiler
+compile-only: reset-time prepare-tree
 	@echo >&2
 	@echo "`tput bold`Compiling packages`tput sgr0`" >&2 && echo >&2
 	@(cd platform && \
diff --git a/platform/Makefile b/platform/Makefile
index 7e11f8e8..08bb9854 100644
--- a/platform/Makefile
+++ b/platform/Makefile
@@ -78,9 +78,6 @@ clean-compiler:
 package-docs: medic-core-docs-pkg medic-rdbms-docs-pkg vm-tools-docs-pkg
 
 build-start:
-	@if [ -n '${BUILD_COMPILER}' ]; then \
-	  ${QMAKE} compiler || exit "$$?"; \
-	fi
 	@(cd source && ../scripts/prepend-path '${COMPILER_ROOT}' \
 	  ${QMAKE} build \
 	    PLATFORM='${PLATFORM}' COMPILER_ROOT='${COMPILER_ROOT}')
@@ -375,7 +372,7 @@ download:
 	@rm -f status/download.finished && \
 	for manifest in source/manifests/*; do \
 	  pkg="`basename "$$manifest"`" && \
-	  if [ "$$pkg" != '*' ]; then \
+	  if [ -f "$$manifest" -a "$$pkg" != '*' ]; then \
 	    ./scripts/retrieve-sources \
 	      "$$pkg" "source/$$pkg/incoming" '${URL}' && \
 	    (cd "source/$$pkg" && ./scripts/rearrange-sources) || exit "$$?"; \
@@ -387,7 +384,7 @@ move-downloaded:
 	@if ! [ -f status/move.finished ]; then \
 	  for manifest in source/manifests/*; do \
 	    pkg="`basename "$$manifest"`" && \
-	    if [ "$$pkg" != '*' ]; then \
+	    if [ -f "$$manifest" -a "$$pkg" != '*' ]; then \
 	      (cd "source/$$pkg" && find incoming -mindepth 1 \
 	        -maxdepth 1 -exec mv {} source/ \;) || exit "$$?"; \
 	    fi; \
@@ -400,7 +397,7 @@ delete-downloaded:
 	for type in incoming source; do \
 	  for manifest in source/manifests/*; do \
 	    pkg="`basename "$$manifest"`" && \
-	    if [ "$$pkg" != '*' ]; then \
+	    if [ -f "$$manifest" -a "$$pkg" != '*' ]; then \
 	      (cd "source/$$pkg" && rm -rf "$$type"/[^.]*) || exit "$$?"; \
 	    fi; \
 	  done; \
diff --git a/platform/source/manifests/compiler b/platform/source/manifests/disabled/compiler
similarity index 100%
rename from platform/source/manifests/compiler
rename to platform/source/manifests/disabled/compiler
diff --git a/platform/source/manifests/medic-core b/platform/source/manifests/medic-core
index 1a1b5592..868dd9a0 100644
--- a/platform/source/manifests/medic-core
+++ b/platform/source/manifests/medic-core
@@ -14,7 +14,7 @@ js, https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
 jq, https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz
 libffi, https://mirrors.kernel.org/sources.redhat.com/libffi/libffi-3.0.13.tar.gz
 libidn, https://ftp.gnu.org/gnu/libidn/libidn-1.27.tar.gz
-libpcap, http://www.tcpdump.org/release/libpcap-1.7.4.tar.gz
+libpcap, https://www.tcpdump.org/release/libpcap-1.7.4.tar.gz
 libressl, https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.3.4.tar.gz
 libusb, https://jaist.dl.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.9/libusb-1.0.9.tar.bz2
 libusb-compat, https://jaist.dl.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-0.1.5/libusb-compat-0.1.5.tar.bz2
@@ -33,7 +33,7 @@ openssl, https://www.openssl.org/source/openssl-1.0.2m.tar.gz
 patch, https://ftp.gnu.org/gnu/patch/patch-2.7.tar.xz
 paxctl, https://pax.grsecurity.net/paxctl-0.9.tar.gz
 pcre, https://jaist.dl.sourceforge.net/project/pcre/pcre/8.33/pcre-8.33.tar.bz2
-popt, http://rpm5.org/files/popt/popt-1.16.tar.gz
+popt, https://ftp.osuosl.org/pub/blfs/conglomeration/popt/popt-1.16.tar.gz
 pv, https://www.ivarch.com/programs/sources/pv-1.6.0.tar.bz2
 readline, https://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz
 rebar, https://github.com/rebar/rebar.git