Skip to content

Commit

Permalink
Don't download GCC anymore, as we don't build it
Browse files Browse the repository at this point in the history
  • Loading branch information
David Brown committed Jun 20, 2018
1 parent b463682 commit 5d2c42d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 14 deletions.
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
9 changes: 3 additions & 6 deletions platform/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}')
Expand Down Expand Up @@ -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 "$$?"; \
Expand All @@ -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; \
Expand All @@ -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; \
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions platform/source/manifests/medic-core
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 5d2c42d

Please sign in to comment.