Merge pull request #1990 from tonytheodore/cross-deps

Improve dependency metadata specification
2017-12-24 16:33:46 +11:00 · 2017-12-24 16:33:46 +11:00 · 2c04c4ca38
parent 8eb5c0e41b 52c8fa8e96
commit 2c04c4ca38
522 changed files with 749 additions and 611 deletions
--- a/267
+++ b/267
@ -62,11 +62,6 @@ STRIP_TOOLCHAIN := $(true)
 STRIP_LIB       := $(false)
 STRIP_EXE       := $(true)

-# All pkgs have (implied) order-only dependencies on MXE_CONF_PKGS.
-# These aren't meaningful to the pkg list in http://mxe.cc/#packages so
-# use a list in case we want to separate autotools, cmake etc.
-MXE_CONF_PKGS := cmake-conf mxe-conf
-
 # define some whitespace variables
 define newline

@ -416,28 +411,113 @@ $(PREFIX)/installed/print-git-oneline-$(GIT_HEAD): | $(PREFIX)/installed/.gitkee
 	@rm -f '$(PREFIX)/installed/print-git-oneline-'*
 	@touch '$@'

+# Common dependency lists for `make` prerequisites and `build-pkg`
+#   - `make` considers only explicit normal deps to trigger rebuilds
+#   - packages can add themselves to implicit MXE_REQS_PKGS in the case
+#       of a tool like `patch` which may be outdated on some systems
+#   - downloads and `build-pkg` use both explicit and implicit deps
+#   - don't depend on `disabled` rules but do depend on virtual pkgs
+
+# cross libraries depend on virtual toolchain package, variable used
+# in `cleanup-deps-style` rule below
+CROSS_COMPILER := cc
+MXE_REQS_PKGS   =
+
+# warning about switching from `gcc` to `cc`
+$(if $(and $(filter gcc,$(LOCAL_PKG_LIST)$(MAKECMDGOALS)),\
+           $(call seq,1,$(words $(LOCAL_PKG_LIST)$(MAKECMDGOALS)))),\
+    $(info == gcc is now a dependency of virtual toolchain package cc) \
+    $(info $(call repeat,$(space),6)- cc will build gcc, pkgconf, and other core toolchain packages)\
+    $(info $(call repeat,$(space),6)- please update scripts accordingly (ignore if you are building gcc alone))\
+    $(info ))
+
+# distinguish between deliberately empty rules and disabled ones
+# used in build-matrix
+VIRTUAL_PKG_TYPES := source-only meta
+# used in deps rules and build-pkg
+BUILD_PKG_TYPES := meta
+# used to avoid unpacking archives when $(PKG)_FILE can't be unset
+SCRIPT_PKG_TYPES := script
+
+# all pkgs have (implied) order-only dependencies on MXE_CONF_PKGS.
+MXE_CONF_PKGS := mxe-conf
+
+# autotools/cmake are generally always required, but separate them
+# for the case of `make gcc` which should only build real deps.
+AUTOTOOLS_PKGS := $(filter-out $(MXE_CONF_PKGS) $(BUILD)~autotools, \
+    $(sort $(basename $(notdir \
+        $(shell grep -l 'auto[conf\|reconf\|gen\|make]\|aclocal\|LIBTOOL' \
+                $(addsuffix /*.mk,$(MXE_PLUGIN_DIRS)))))))
+
+CMAKE_PKGS := $(filter-out $(MXE_CONF_PKGS) cmake-conf cmake, \
+    $(sort $(basename $(notdir \
+        $(shell grep -l '(TARGET)-cmake' \
+                $(addsuffix /*.mk,$(MXE_PLUGIN_DIRS)))))))
+
+# all other packages should list their deps explicitly, if tools become
+# universally used, we can add them to the toolchain deps (e.g. pkgconf)
+# or add new implicit `${TOOL}_PKGS` rules
+
+# $(PKG) and $(TARGET) are in scope from the calling loop so reference
+# variables by name instead of position
+
+# explicit normal package deps
+PKG_DEPS = \
+    $(foreach DEP,$(value $(call LOOKUP_PKG_RULE,$(PKG),DEPS,$(TARGET))), \
+        $(if $(filter $(DEP),$(PKGS)), \
+            $(if $(or $(value $(call LOOKUP_PKG_RULE,$(DEP),BUILD,$(TARGET))), \
+                      $(filter $($(DEP)_TYPE),$(BUILD_PKG_TYPES))), \
+                $(TARGET)/installed/$(DEP)) \
+        $(else), \
+            $(if $(or $(value $(call LOOKUP_PKG_RULE,$($(DEP)_PKG),BUILD,$($(DEP)_TGT))), \
+                      $(filter $($($(DEP)_PKG)_TYPE),$(BUILD_PKG_TYPES))), \
+                $($(DEP)_TGT)/installed/$($(DEP)_PKG))))
+
+# order-only package deps unlikely to need target lookup
+PKG_OO_DEPS = \
+    $(foreach DEP,$($(PKG)_OO_DEPS), \
+        $(if $(filter $(DEP),$(PKGS)), \
+            $(if $(or $(value $(call LOOKUP_PKG_RULE,$(DEP),BUILD,$(TARGET))), \
+                      $(filter $($(DEP)_TYPE),$(BUILD_PKG_TYPES))), \
+                $(TARGET)/installed/$(DEP)) \
+        $(else), \
+            $(if $(or $(value $(call LOOKUP_PKG_RULE,$($(DEP)_PKG),BUILD,$($(DEP)_TGT))), \
+                      $(filter $($($(DEP)_PKG)_TYPE),$(BUILD_PKG_TYPES))), \
+                $($(DEP)_TGT)/installed/$($(DEP)_PKG))))
+
+# all deps for download rule
+PKG_ALL_DEPS = \
+    $(foreach DEP,$($(PKG)_OO_DEPS) $(value $(call LOOKUP_PKG_RULE,$(PKG),DEPS,$(TARGET))), \
+        $(if $(filter $(DEP),$(PKGS)), \
+            $(TARGET)~$(DEP), \
+            $(DEP)))
+
+
 # include files from MXE_PLUGIN_DIRS, set base filenames and `all-<plugin>` target
 PLUGIN_FILES := $(realpath $(wildcard $(addsuffix /*.mk,$(MXE_PLUGIN_DIRS))))
-PLUGIN_PKGS  := $(basename $(notdir $(PLUGIN_FILES)))
+PKGS         := $(sort $(basename $(notdir $(PLUGIN_FILES))))
 $(foreach FILE,$(PLUGIN_FILES),\
    $(eval $(basename $(notdir $(FILE)))_MAKEFILE  ?= $(FILE)) \
    $(eval $(basename $(notdir $(FILE)))_TEST_FILE ?= $(wildcard $(basename $(FILE))-test.*)) \
    $(eval all-$(lastword $(call split,/,$(dir $(FILE)))): $(basename $(notdir $(FILE)))))
 include $(PLUGIN_FILES)
-PKGS := $(sort $(MXE_CONF_PKGS) $(PLUGIN_PKGS))

 # create target sets for PKG_TARGET_RULE loop to avoid creating empty rules
 # and having to explicitly disable $(BUILD) for most packages
+# add autotools, cmake, mxe-conf implicit order-only deps
 CROSS_TARGETS := $(filter-out $(BUILD),$(MXE_TARGETS))
 $(foreach PKG,$(PKGS), \
-    $(foreach TARGET,$(or $(sort $($(PKG)_TARGETS)),$(CROSS_TARGETS)), \
+    $(if $(filter $(PKG),$(filter-out $(autotools_DEPS),$(AUTOTOOLS_PKGS))),\
+        $(eval $(PKG)_OO_DEPS += $(BUILD)~autotools)) \
+    $(if $(filter $(PKG),$(CMAKE_PKGS)),$(eval $(PKG)_OO_DEPS += cmake-conf)) \
+    $(if $(filter $(PKG),$(MXE_CONF_PKGS)),,$(eval $(PKG)_OO_DEPS += mxe-conf)) \
+    $(if $($(PKG)_TARGETS),,$(eval $(PKG)_TARGETS := $(CROSS_TARGETS))) \
+    $(foreach TARGET,$(filter $($(PKG)_TARGETS),$(CROSS_TARGETS) $(BUILD)), \
+        $(eval $(TARGET)~$(PKG)_PKG := $(PKG)) \
+        $(eval $(TARGET)~$(PKG)_TGT := $(TARGET)) \
        $(eval $(TARGET)_PKGS += $(PKG)) \
        $(eval FILTERED_PKGS  += $(PKG))))

-# cross targets depend on native target
-$(foreach TARGET,$(CROSS_TARGETS),\
-    $(eval $(TARGET)_DEPS = $(BUILD)))
-
 # always add $(BUILD) to our targets
 override MXE_TARGETS := $(CROSS_TARGETS) $(BUILD)

@ -485,7 +565,7 @@ _LOOKUP_PKG_RULE = $(strip \
 PKG_COL_WIDTH    := $(call plus,2,$(call LIST_NMAX, $(sort $(call map, strlen, $(PKGS)))))
 MAX_TARGET_WIDTH := $(call LIST_NMAX, $(sort $(call map, strlen, $(MXE_TARGETS))))
 TARGET_COL_WIDTH := $(call subtract,100,$(call plus,$(PKG_COL_WIDTH),$(MAX_TARGET_WIDTH)))
-PRINTF_FMT       := printf '%-11s %-$(PKG_COL_WIDTH)s %-$(TARGET_COL_WIDTH)s %-15s %s\n'
+PRINTF_FMT       := printf '%-13s %-$(PKG_COL_WIDTH)s %-$(TARGET_COL_WIDTH)s %-15s %s\n'
 RTRIM            := $(SED) 's, \+$$$$,,'
 WRAP_MESSAGE      = $(\n)$(\n)$(call repeat,-,60)$(\n)$(1)$(and $(2),$(\n)$(\n)$(2))$(\n)$(call repeat,-,60)$(\n)

@ -518,21 +598,22 @@ define PKG_RULE
 $(if $($(PKG)_GH_CONF),$(eval $(MXE_SETUP_GITHUB)))
 $(eval $(PKG)_PATCHES := $(PKG_PATCHES))

-.PHONY: download-$(1)
-download-$(1): $(addprefix download-,$($(1)_DEPS)) download-only-$(1)
-
 .PHONY: download-only-$(1)
 # Packages can share a source archive to build different sets of features
 # or dependencies (see bfd/binutils openscenegraph/openthreads qwt/qwt_qt4).
 # Use a double-colon rule to allow multiple definitions:
 # https://www.gnu.org/software/make/manual/html_node/Double_002dColon.html
+# N.B. the `::` rule will use values from first lexical definition e.g.:
+# $ make download-only-binutils
+# [download]  bfd
+.PHONY: download-only-$($(1)_FILE)
 download-only-$(1): download-only-$($(1)_FILE)
 download-only-$($(1)_FILE)::
 	$(and $($(1)_URL),
-	@[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)'
 	@$$(if $$(REMOVE_DOWNLOAD),rm -f '$(PKG_DIR)/$($(1)_FILE)')
 	@if ! $(call CHECK_PKG_ARCHIVE,$(1)); then \
-	    $(PRINTF_FMT) '[download]' '$(1)' | $(RTRIM); \
+	    $(PRINTF_FMT) '[download]' '$($(1)_FILE)' | $(RTRIM); \
+	    [ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)'; \
 	    ($(call DOWNLOAD_PKG_ARCHIVE,$(1))) &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)-download'; \
 	    grep 'MXE Warning' '$(LOG_DIR)/$(TIMESTAMP)/$(1)-download'; \
 	    ln -sf '$(TIMESTAMP)/$(1)-download' '$(LOG_DIR)/$(1)-download'; \
@ -576,54 +657,71 @@ endif

 $(NONET_LIB): $(TOP_DIR)/tools/nonetwork.c | $(PREFIX)/$(BUILD)/lib/.gitkeep
 	@echo '[build nonetwork lib]'
-	@$(BUILD_CC) -shared -fPIC $(NONET_CFLAGS) -o $@ $<
+	+@$(BUILD_CC) -shared -fPIC $(NONET_CFLAGS) -o $@ $<

 .PHONY: shell
 shell: $(NONET_LIB)
 	$(PRELOAD) $(SHELL)

 define PKG_TARGET_RULE
-.PHONY: $(1)
-$(1): $(PREFIX)/$(3)/installed/$(1)
+.PHONY: download-$(1)
+download-$(1): download-$(3)~$(1) download-only-$(1)
+
+.PHONY: download-$(3)~$(1)
+download-$(3)~$(1): download-only-$(1) \
+                    $(addprefix download-,$(PKG_ALL_DEPS))
+
+.PHONY: $(1) $(1)~$(3)
+$(1) $(1)~$(3): $(PREFIX)/$(3)/installed/$(1)
 $(PREFIX)/$(3)/installed/$(1): $(PKG_MAKEFILES) \
                          $($(PKG)_PATCHES) \
                          $(PKG_TESTFILES) \
                          $($(1)_FILE_DEPS) \
-                          $(addprefix $(PREFIX)/$(3)/installed/,$(value $(call LOOKUP_PKG_RULE,$(1),DEPS,$(3)))) \
-                          $(and $($(3)_DEPS),$(addprefix $(PREFIX)/$($(3)_DEPS)/installed/,$(filter-out $(MXE_CONF_PKGS),$($($(3)_DEPS)_PKGS)))) \
+                          $(addprefix $(PREFIX)/,$(PKG_DEPS)) \
                          | $(if $(DONT_CHECK_REQUIREMENTS),,check-requirements) \
                          $(if $(value $(call LOOKUP_PKG_RULE,$(1),URL,$(3))),download-only-$(1)) \
-                          $(addprefix $(PREFIX)/$(3)/installed/,$(if $(call set_is_not_member,$(1),$(MXE_CONF_PKGS)),$(MXE_CONF_PKGS))) \
+                          $(addprefix $(PREFIX)/,$(PKG_OO_DEPS)) \
                          $(NONET_LIB) \
                          $(PREFIX)/$(3)/installed/.gitkeep \
                          print-git-oneline
-	@[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)'
-	$(if $(value $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3))),
-	    @$(PRINTF_FMT) '[build]'    '$(1)' '$(3)' | $(RTRIM)
-	,
-	    @$(PRINTF_FMT) '[no-build]' '$(1)' '$(3)' | $(RTRIM)
-	)
 	$(if $(value $(call LOOKUP_PKG_RULE,$(1),MESSAGE,$(3))),
 	    @$(PRINTF_FMT) '[message]'  '$(1)' '$(3) $($(call LOOKUP_PKG_RULE,$(1),MESSAGE,$(3)))' \
 	    | $(RTRIM)
 	)
-	@touch '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)'
-	@ln -sf '$(TIMESTAMP)/$(1)_$(3)' '$(LOG_DIR)/$(1)_$(3)'
-	@if ! (time $(PRELOAD) WINEPREFIX='$(2)/readonly' $(MAKE) -f '$(MAKEFILE)' 'build-only-$(1)_$(3)' WGET=false) &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)'; then \
-	    echo; \
-	    echo 'Failed to build package $(1) for target $(3)!'; \
-	    echo '------------------------------------------------------------'; \
-	    $(if $(findstring undefined, $(origin MXE_VERBOSE)),\
-	        tail -n 10 '$(LOG_DIR)/$(1)_$(3)' | $(SED) -n '/./p';, \
-	        $(SED) -n '/./p' '$(LOG_DIR)/$(1)_$(3)';) \
-	    echo '------------------------------------------------------------'; \
-	    echo '[log]      $(LOG_DIR)/$(1)_$(3)'; \
-	    echo; \
-	    exit 1; \
-	fi
 	$(if $(value $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3))),
-	    @$(PRINTF_FMT) '[done]' '$(1)' '$(3)' "`grep -a '^du:.*KiB$$\' '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)' | cut -d ':' -f2 | tail -1`" \
-	                                          "`grep -a '^real.*m.*s$$\' '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)' | tr '\t' ' ' | cut -d ' ' -f2 | tail -1`")
+	    $(if $(BUILD_DRY_RUN), \
+	        @$(PRINTF_FMT) '[dry-run]' '$(1)' '$(3)' | $(RTRIM)
+	        @[ -d '$(PREFIX)/$(3)/lib' ] || mkdir -p '$(PREFIX)/$(3)/lib'
+	        @touch '$(PREFIX)/$(3)/lib/$(1).dry-run'
+	        @touch '$(PREFIX)/$(3)/installed/$(1)'
+	    $(else),
+	        @$(PRINTF_FMT) '[build]'    '$(1)' '$(3)' | $(RTRIM)
+	        @[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)'
+	        @touch '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)'
+	        @ln -sf '$(TIMESTAMP)/$(1)_$(3)' '$(LOG_DIR)/$(1)_$(3)'
+	        @if ! (time $(PRELOAD) WINEPREFIX='$(2)/readonly' \
+	               $(MAKE) -f '$(MAKEFILE)' \
+	                   'build-only-$(1)_$(3)' \
+	                   WGET=false \
+	               ) &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)'; then \
+	            echo; \
+	            echo 'Failed to build package $(1) for target $(3)!'; \
+	            echo '------------------------------------------------------------'; \
+	            $(if $(findstring undefined, $(origin MXE_VERBOSE)),\
+	                tail -n 10 '$(LOG_DIR)/$(1)_$(3)' | $(SED) -n '/./p';, \
+	                $(SED) -n '/./p' '$(LOG_DIR)/$(1)_$(3)';) \
+	            echo '------------------------------------------------------------'; \
+	            echo '[log]      $(LOG_DIR)/$(1)_$(3)'; \
+	            echo; \
+	            exit 1; \
+	        fi
+	        @$(PRINTF_FMT) '[done]' '$(1)' '$(3)' "`grep -a '^du:.*KiB$$\' '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)' | cut -d ':' -f2 | tail -1`" \
+	                                          "`grep -a '^real.*m.*s$$\' '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)' | tr '\t' ' ' | cut -d ' ' -f2 | tail -1`"
+	    )
+	$(else),
+	    @$(PRINTF_FMT) '[$(or $($(PKG)_TYPE),disabled)]' '$(1)' '$(3)' | $(RTRIM)
+	    @touch '$(PREFIX)/$(3)/installed/$(1)'
+	)


 .PHONY: build-only-$(1)_$(3)
@ -670,7 +768,8 @@ build-only-$(1)_$(3):
 	    mkdir -p '$(2)/readonly'
 	    chmod 0555 '$(2)/readonly'

-	    $$(if $(value $(call LOOKUP_PKG_RULE,$(1),FILE,$(3))),\
+	    $$(if $(and $(value $(call LOOKUP_PKG_RULE,$(1),FILE,$(3))),\
+	                $(call not,$(filter $(SCRIPT_PKG_TYPES),$($(PKG)_TYPE)))),\
 	        $$(call PREPARE_PKG_SOURCE,$(1),$(2)))
 	    $$(call $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3)),$(2)/$($(1)_SUBDIR))
 	    @echo
@ -759,12 +858,12 @@ show-upstream-deps-%:
 print-deps-for-build-pkg:
 	$(foreach TARGET,$(sort $(MXE_TARGETS)), \
 	    $(foreach PKG,$(sort $($(TARGET)_PKGS)), \
-	        $(info $(strip for-build-pkg $(TARGET)~$(PKG) \
-	        $(subst $(space),-,$($(PKG)_VERSION)) \
-	        $(addprefix $(TARGET)~,$(value $(call LOOKUP_PKG_RULE,$(PKG),DEPS,$(TARGET)))) \
-	        $(addprefix $(TARGET)~,$(if $(call set_is_not_member,$(PKG),$(MXE_CONF_PKGS)),$(MXE_CONF_PKGS))) \
-	        $(and $($(TARGET)_DEPS),$(addprefix $($(TARGET)_DEPS)~,$($($(TARGET)_DEPS)_PKGS)))))))
-	        @echo -n
+	        $(if $(or $(value $(call LOOKUP_PKG_RULE,$(PKG),BUILD,$(TARGET))), \
+	                  $(filter $($(PKG)_TYPE),$(BUILD_PKG_TYPES))), \
+	            $(info $(strip for-build-pkg $(TARGET)~$(PKG) \
+	            $(subst $(space),-,$($(PKG)_VERSION)) \
+	            $(subst /installed/,~,$(PKG_DEPS) $(PKG_OO_DEPS)))))))
+	            @echo -n

 BUILD_PKG_TMP_FILES := *-*.list mxe-*.tar.xz mxe-*.deb* wheezy jessie

@ -807,9 +906,9 @@ cleanup-style:
 cleanup-deps-style:
 	@grep '(PKG)_DEPS.*\\' $(foreach 1,$(PKGS),$(PKG_MAKEFILES)) > $(TOP_DIR)/tmp-$@-pre
 	@$(foreach PKG,$(PKGS), \
-	    $(if $(call lne,$(sort $(filter-out gcc,$($(PKG)_DEPS))),$(filter-out gcc,$($(PKG)_DEPS))), \
+	    $(if $(call lne,$(sort $(filter-out $(CROSS_COMPILER),$($(PKG)_DEPS))),$(filter-out $(CROSS_COMPILER),$($(PKG)_DEPS))), \
 	        $(info [cleanup] $(PKG)) \
-	        $(SED) -i 's/^\([^ ]*_DEPS *:=\)[^$$]*$$/\1 '"$(strip $(filter gcc,$($(PKG)_DEPS)) $(sort $(filter-out gcc,$($(PKG)_DEPS))))"'/' '$(call PKG_MAKEFILES,$(PKG))'; \
+	        $(SED) -i 's/^\([^ ]*_DEPS *:=\)[^$$]*$$/\1 '"$(strip $(filter $(CROSS_COMPILER),$($(PKG)_DEPS)) $(sort $(filter-out $(CROSS_COMPILER),$($(PKG)_DEPS))))"'/' '$(call PKG_MAKEFILES,$(PKG))'; \
 	    ))
 	@grep '(PKG)_DEPS.*\\' $(foreach 1,$(PKGS),$(PKG_MAKEFILES)) > $(TOP_DIR)/tmp-$@-post
 	@diff -u $(TOP_DIR)/tmp-$@-pre $(TOP_DIR)/tmp-$@-post >/dev/null \
@ -867,29 +966,41 @@ docs/build-matrix.html: $(foreach 1,$(PKGS),$(PKG_MAKEFILES))
 #     $(eval $(VIRTUAL_PKGCOUNT += x))
 # vs
 #     $(eval $(VIRTUAL_PKGCOUNT := $(call int_inc,$(VIRTUAL_PKGCOUNT))))
-	@$(foreach PKG,$(PKGS),                      \
-	    $(eval $(PKG)_VIRTUAL := $(true))        \
-	    $(eval $(PKG)_BUILD_ONLY := $(true))     \
-	    echo -e '<tr>\n                          \
-	        <th class="row">$(PKG)</th>\n        \
-	        <td>$(call substr,$($(PKG)_VERSION),1,12)$(if $(call gt,$(call strlen,$($(PKG)_VERSION)),12),&hellip;)</td>\n\
-	    $(foreach TARGET,$(MXE_TARGET_LIST),     \
-	        $(if $(value $(call LOOKUP_PKG_RULE,$(PKG),BUILD,$(TARGET))), \
-	            $(eval $(TARGET)_PKGCOUNT += x) \
-	            $(eval $(PKG)_VIRTUAL := $(false)) \
-	            $(eval $(PKG)_BUILD_ONLY := $(false)) \
-	            <td class="supported">&#x2713;</td>,            \
-	            <td class="unsupported">&#x2717;</td>)\n)       \
-	    $(if $(and $(call set_is_member,$(PKG),$($(BUILD)_PKGS)), \
-	               $(value $(call LOOKUP_PKG_RULE,$(PKG),BUILD,$(BUILD)))), \
-	        $(eval $(PKG)_VIRTUAL := $(false))   \
-	        <td class="supported">&#x2713;</td>, \
-	        <td class="unsupported">&#x2717;</td>)\n \
-	        </tr>\n' >> $@ $(newline)            \
-	    $(if $($(PKG)_VIRTUAL),                  \
-	       $(eval VIRTUAL_PKGCOUNT += x) \
-	        $(eval $(PKG)_BUILD_ONLY := $(false))) \
-	    $(if $($(PKG)_BUILD_ONLY),               \
+	@$(foreach PKG,$(PKGS), \
+	    $(eval $(PKG)_VIRTUAL := $(true)) \
+	    $(eval $(PKG)_BUILD_ONLY := $(true)) \
+	    echo -e '<tr>\n \
+	        <th class="row" \
+	            title="$($(PKG)_MESSAGE)"> \
+	            $(PKG) \
+	            $(if $($(PKG)_TYPE), [$($(PKG)_TYPE)-pkg]) \
+	            $(if $($(PKG)_MESSAGE), **)\
+	        </th>\n \
+	        <td>$(call substr,$($(PKG)_VERSION),1,12) \
+	            $(if $(call gt,$(call strlen,$($(PKG)_VERSION)),12),&hellip;)</td>\n\
+	    $(foreach TARGET,$(MXE_TARGET_LIST), \
+	        $(if $(filter $(VIRTUAL_PKG_TYPES),$($(PKG)_TYPE)), \
+	            $(if $(filter $(TARGET),$($(PKG)_TARGETS)), \
+	                <td class="neutral">&bull;</td>, \
+	                <td></td>), \
+	            $(if $(filter $(TARGET),$($(PKG)_TARGETS)), \
+	                $(if $(value $(call LOOKUP_PKG_RULE,$(PKG),BUILD,$(TARGET))), \
+	                    $(eval $(TARGET)_PKGCOUNT += x) \
+	                    <td class="supported">&#x2713;</td>, \
+	                    <td class="unsupported">&#x2717;</td>),\
+	                	<td></td>))\n) \
+	    $(if $(filter $(VIRTUAL_PKG_TYPES),$($(PKG)_TYPE)), \
+	        $(eval VIRTUAL_PKGCOUNT += x) \
+	        $(if $(filter $(BUILD),$($(PKG)_TARGETS)), \
+	            <td class="neutral">&bull;</td>, \
+	            <td></td>), \
+	        $(if $(filter $(BUILD),$($(PKG)_TARGETS)), \
+	            $(if $(value $(call LOOKUP_PKG_RULE,$(PKG),BUILD,$(BUILD))), \
+	                <td class="supported">&#x2713;</td>, \
+	                <td class="unsupported">&#x2717;</td>), \
+	                <td></td>))\n \
+	        </tr>\n' >> $@ $(newline) \
+	    $(if $(call seq,$(BUILD),$($(PKG)_TARGETS)), \
 	        $(eval BUILD_ONLY_PKGCOUNT += x)))
 	@echo '<tr>'                            >> $@
 	@echo '<th class="row" colspan="2">'    >> $@
--- a/docs/assets/build-matrix.css
+++ b/docs/assets/build-matrix.css
@ -12,3 +12,7 @@ td.unsupported {
    background-color: #f99;
    text-align: center;
 }
+td.neutral {
+    background-color: #d1d1d1;
+    text-align: center;
+}
--- a/docs/index.html
+++ b/docs/index.html
@ -278,7 +278,7 @@ exit</pre>
    <p>
    If you only need the most basic tools you can also use:
    </p>
-    <pre>make gcc</pre>
+    <pre>make cc</pre>
    <p>
    and add any additional packages you need later on.
    You can also supply a host of packages on the
@ -933,7 +933,7 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
        non-parallel
        </dd>

-    <dt>make gcc</dt>
+    <dt>make cc</dt>

        <dd>
        build a minimal useful set of packages,
@ -1344,14 +1344,14 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre>
        The easiest way to get the dependencies right
        is to start with a minimal setup.
        That is,
-        initialize MXE with <code>make gcc</code> only,
+        initialize MXE with <code>make cc</code> only,
        then check whether your package builds successfully.
        </p>

        <p>
-        Always list the dependency on <code>gcc</code> explicitly:
+        Always list the dependency on <code>cc</code> explicitly:
        </p>
-        <pre>$(PKG)_DEPS     := gcc ...</pre>
+        <pre>$(PKG)_DEPS     := cc ...</pre>

        <p>
        Specify official name and website of a package.
--- a/plugins/README.md
+++ b/plugins/README.md
@ -141,7 +141,7 @@ foo_PATCHES :=
 To alter dependencies and components:

 ```make
-qt_DEPS := gcc dbus jpeg libmng libpng openssl tiff zlib
+qt_DEPS := cc dbus jpeg libmng libpng openssl tiff zlib

 qt_BUILD := \
    $(subst -accessibility ,-no-accessibility ,\
--- a/plugins/apps/clementine.mk
+++ b/plugins/apps/clementine.mk
@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := b36dc3f24366aabd591e83998b0d437f13755eae62cff4d8a2833c5995bc2
 $(PKG)_GH_CONF  := clementine-player/Clementine/qt5
 $(PKG)_WEBSITE  := https://www.clementine-player.org/
 $(PKG)_OWNER    := https://github.com/pavelvat
-$(PKG)_DEPS     := gcc boost chromaprint cryptopp fftw glew gst-libav gst-plugins-bad \
+$(PKG)_DEPS     := cc boost chromaprint cryptopp fftw glew gst-libav gst-plugins-bad \
                   gst-plugins-good gst-plugins-ugly liblastfm \
                   libmpcdec protobuf qtsparkle sparsehash

--- a/plugins/apps/clementine_qt4.mk
+++ b/plugins/apps/clementine_qt4.mk
@ -15,7 +15,7 @@ $(PKG)_CHECKSUM := f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f
 $(PKG)_GH_CONF  := clementine-player/Clementine/tags
 $(PKG)_WEBSITE  := https://www.clementine-player.org/
 $(PKG)_OWNER    := https://github.com/pavelvat
-$(PKG)_DEPS     := gcc boost chromaprint cryptopp fftw glew gst-libav gst-plugins-bad \
+$(PKG)_DEPS     := cc boost chromaprint cryptopp fftw glew gst-libav gst-plugins-bad \
                   gst-plugins-good gst-plugins-ugly libechonest liblastfm_qt4 \
                   libmpcdec protobuf qtsparkle_qt4 sparsehash

--- a/plugins/apps/keepassx.mk
+++ b/plugins/apps/keepassx.mk
@ -9,7 +9,7 @@ $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://www.keepassx.org/releases/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_WEBSITE  := https://www.keepassx.org
 $(PKG)_OWNER    := https://github.com/starius
-$(PKG)_DEPS     := gcc qt
+$(PKG)_DEPS     := cc qt

 define $(PKG)_UPDATE
 $(WGET) -q -O- 'https://www.keepassx.org/downloads/' | \
--- a/plugins/apps/msmtp.mk
+++ b/plugins/apps/msmtp.mk
@ -8,7 +8,7 @@ $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_OWNER    := https://github.com/andrew-strong
-$(PKG)_DEPS     := gcc gnutls libgcrypt libgpg_error libgsasl libiconv libidn libntlm
+$(PKG)_DEPS     := cc gnutls libgcrypt libgpg_error libgsasl libiconv libidn libntlm

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://sourceforge.net/projects/msmtp/files/msmtp/' | \
--- a/plugins/apps/qbittorrent.mk
+++ b/plugins/apps/qbittorrent.mk
@ -9,7 +9,7 @@ $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_WEBSITE  := https://qbittorrent.org/
 $(PKG)_OWNER    := https://github.com/starius
-$(PKG)_DEPS     := gcc boost libtorrent-rasterbar qt
+$(PKG)_DEPS     := cc boost libtorrent-rasterbar qt $(BUILD)~geoip-database

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://www.qbittorrent.org/download.php' | \
--- a/plugins/apps/ricochet.mk
+++ b/plugins/apps/ricochet.mk
@ -9,7 +9,7 @@ $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION)-src.tar.bz2
 $(PKG)_URL      := https://ricochet.im/releases/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_WEBSITE  := https://ricochet.im/
 $(PKG)_OWNER    := https://github.com/starius
-$(PKG)_DEPS     := gcc openssl protobuf qtbase qtdeclarative qtmultimedia qtquickcontrols qttools
+$(PKG)_DEPS     := cc openssl protobuf qtbase qtdeclarative qtmultimedia qtquickcontrols qttools

 define $(PKG)_UPDATE
    $(call MXE_GET_GITHUB_TAGS, ricochet-im/ricochet, v)
--- a/plugins/apps/tor.mk
+++ b/plugins/apps/tor.mk
@ -9,7 +9,7 @@ $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://torproject.org/dist/$($(PKG)_FILE)
 $(PKG)_WEBSITE  := https://torproject.org/
 $(PKG)_OWNER    := https://github.com/starius
-$(PKG)_DEPS     := gcc libevent openssl zlib
+$(PKG)_DEPS     := cc libevent openssl zlib

 define $(PKG)_UPDATE
 $(WGET) -q -O- 'https://torproject.org/download/download' | \
--- a/plugins/apps/wrk.mk
+++ b/plugins/apps/wrk.mk
@ -9,7 +9,7 @@ $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/wg/wrk/archive/$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := https://github.com/wg/wrk
 $(PKG)_OWNER    := https://github.com/starius
-$(PKG)_DEPS     := gcc luajit openssl pthreads
+$(PKG)_DEPS     := cc luajit openssl pthreads $(BUILD)~luajit

 define $(PKG)_UPDATE
    $(call MXE_GET_GITHUB_TAGS, wg/wrk)
--- a/plugins/examples/custom-qt-min/overrides.mk
+++ b/plugins/examples/custom-qt-min/overrides.mk
@ -12,7 +12,7 @@

 $(info == Custom Qt overrides: $(lastword $(MAKEFILE_LIST)))

-qt_DEPS := gcc
+qt_DEPS := cc

 define qt_BUILD
    $(SED) -i 's,\(^QMAKE_CFLAGS_RELEASE\).*,\1 = -pipe -Os -fomit-frame-pointer -momit-leaf-frame-pointer -fdata-sections -ffunction-sections,g' '$(1)/mkspecs/win32-g++/qmake.conf'
--- a/plugins/examples/host-toolchain/binutils-host.mk
+++ b/plugins/examples/host-toolchain/binutils-host.mk
@ -8,7 +8,7 @@ $(PKG)_SUBDIR    = $(binutils_SUBDIR)
 $(PKG)_FILE      = $(binutils_FILE)
 $(PKG)_URL       = $(binutils_URL)
 $(PKG)_URL_2     = $(binutils_URL_2)
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := cc

 define $(PKG)_UPDATE
    echo $(binutils_VERSION)
--- a/plugins/examples/host-toolchain/cmake-host.mk
+++ b/plugins/examples/host-toolchain/cmake-host.mk
@ -8,7 +8,7 @@ $(PKG)_SUBDIR    = $(cmake_SUBDIR)
 $(PKG)_FILE      = $(cmake_FILE)
 $(PKG)_URL       = $(cmake_URL)
 $(PKG)_URL_2     = $(cmake_URL_2)
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := cc

 define $(PKG)_UPDATE
    echo $(cmake_VERSION)
--- a/plugins/examples/host-toolchain/gcc-host.mk
+++ b/plugins/examples/host-toolchain/gcc-host.mk
@ -9,7 +9,7 @@ $(PKG)_FILE      = $(gcc_FILE)
 $(PKG)_PATCHES   = $(gcc_PATCHES)
 $(PKG)_URL       = $(gcc_URL)
 $(PKG)_URL_2     = $(gcc_URL_2)
-$(PKG)_DEPS     := gcc binutils-host gmp isl mpfr mpc pthreads
+$(PKG)_DEPS     := cc binutils-host gmp isl mpc mpfr pthreads

 define $(PKG)_UPDATE
    echo $(gcc_VERSION)
--- a/plugins/examples/host-toolchain/pkgconf-host.mk
+++ b/plugins/examples/host-toolchain/pkgconf-host.mk
@ -8,7 +8,7 @@ $(PKG)_SUBDIR    = $(pkgconf_SUBDIR)
 $(PKG)_FILE      = $(pkgconf_FILE)
 $(PKG)_URL       = $(pkgconf_URL)
 $(PKG)_URL_2     = $(pkgconf_URL_2)
-$(PKG)_DEPS     := gcc libffi
+$(PKG)_DEPS     := cc libffi

 define $(PKG)_UPDATE
    echo $(pkgconf_VERSION)
--- a/plugins/examples/host-toolchain/qt5-host-tools.mk
+++ b/plugins/examples/host-toolchain/qt5-host-tools.mk
@ -4,7 +4,7 @@ PKG             := $(basename $(notdir $(lastword $(MAKEFILE_LIST))))
 $(PKG)_FILE      = $(qtbase_FILE)
 $(PKG)_PATCHES   = $(realpath $(sort $(wildcard $(addsuffix /qtbase-[0-9]*.patch, $(TOP_DIR)/src))))
 $(PKG)_SUBDIR    = $(qtbase_SUBDIR)
-$(PKG)_DEPS     := gcc gcc-host make-w32-bin qtbase winpthreads-host
+$(PKG)_DEPS     := cc gcc-host make-w32-bin qtbase winpthreads-host

 # main configure options: -platform -host-option -external-hostbindir
 # further testing needed: -prefix -extprefix -hostprefix -sysroot -no-gcc-sysroot
--- a/plugins/examples/host-toolchain/winpthreads-host.mk
+++ b/plugins/examples/host-toolchain/winpthreads-host.mk
@ -9,7 +9,7 @@ $(PKG)_FILE      = $(mingw-w64_FILE)
 $(PKG)_PATCHES   = $(mingw-w64_PATCHES)
 $(PKG)_URL       = $(mingw-w64_URL)
 $(PKG)_URL_2     = $(mingw-w64_URL_2)
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := cc

 define $(PKG)_UPDATE
    echo $(mingw-w64_VERSION)
--- a/plugins/examples/qt5-freeze/qt3d.mk
+++ b/plugins/examples/qt5-freeze/qt3d.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qt3d,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qt3d,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qt3d,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative
+$(PKG)_DEPS     := cc qtbase qtdeclarative

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtactiveqt.mk
+++ b/plugins/examples/qt5-freeze/qtactiveqt.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtactiveqt,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtactiveqt,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtactiveqt,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase
+$(PKG)_DEPS     := cc qtbase

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtbase.mk
+++ b/plugins/examples/qt5-freeze/qtbase.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR   := $(PKG)-opensource-src-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre postgresql sqlite zlib
+$(PKG)_DEPS     := cc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre postgresql sqlite zlib

 # allows for side-by-side install with later Qt
 # pkg-config and cmake will need tweaking to really get working
--- a/plugins/examples/qt5-freeze/qtcanvas3d.mk
+++ b/plugins/examples/qt5-freeze/qtcanvas3d.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtcanvas3d,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtcanvas3d,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtcanvas3d,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative
+$(PKG)_DEPS     := cc qtbase qtdeclarative

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtcharts.mk
+++ b/plugins/examples/qt5-freeze/qtcharts.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtcharts,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtcharts,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtcharts,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative qtmultimedia
+$(PKG)_DEPS     := cc qtbase qtdeclarative qtmultimedia

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtconnectivity.mk
+++ b/plugins/examples/qt5-freeze/qtconnectivity.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtconnectivity,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtconnectivity,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtconnectivity,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative
+$(PKG)_DEPS     := cc qtbase qtdeclarative

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtdatavis3d.mk
+++ b/plugins/examples/qt5-freeze/qtdatavis3d.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtdatavis3d,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtdatavis3d,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtdatavis3d,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative qtmultimedia
+$(PKG)_DEPS     := cc qtbase qtdeclarative qtmultimedia

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtdeclarative-render2d.mk
+++ b/plugins/examples/qt5-freeze/qtdeclarative-render2d.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtdeclarative-render2d,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtdeclarative-render2d,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtdeclarative-render2d,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative
+$(PKG)_DEPS     := cc qtbase qtdeclarative

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtdeclarative.mk
+++ b/plugins/examples/qt5-freeze/qtdeclarative.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtdeclarative,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtdeclarative,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtsvg qtxmlpatterns
+$(PKG)_DEPS     := cc qtbase qtsvg qtxmlpatterns

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtgamepad.mk
+++ b/plugins/examples/qt5-freeze/qtgamepad.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtgamepad,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtgamepad,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtgamepad,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative
+$(PKG)_DEPS     := cc qtbase qtdeclarative

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtgraphicaleffects.mk
+++ b/plugins/examples/qt5-freeze/qtgraphicaleffects.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtgraphicaleffects,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtgraphicaleffects,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtgraphicaleffects,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative
+$(PKG)_DEPS     := cc qtbase qtdeclarative

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtimageformats.mk
+++ b/plugins/examples/qt5-freeze/qtimageformats.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtimageformats,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtimageformats,$(qtbase_URL))
-$(PKG)_DEPS     := gcc jasper libmng libwebp qtbase tiff
+$(PKG)_DEPS     := cc jasper libmng libwebp qtbase tiff

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtlocation.mk
+++ b/plugins/examples/qt5-freeze/qtlocation.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtlocation,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtlocation,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtlocation,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative qtmultimedia
+$(PKG)_DEPS     := cc qtbase qtdeclarative qtmultimedia

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtmultimedia.mk
+++ b/plugins/examples/qt5-freeze/qtmultimedia.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtmultimedia,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtmultimedia,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase
+$(PKG)_DEPS     := cc qtbase

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtpurchasing.mk
+++ b/plugins/examples/qt5-freeze/qtpurchasing.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtpurchasing,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtpurchasing,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtpurchasing,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative
+$(PKG)_DEPS     := cc qtbase qtdeclarative

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtquickcontrols.mk
+++ b/plugins/examples/qt5-freeze/qtquickcontrols.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtquickcontrols,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtquickcontrols,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtquickcontrols,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative
+$(PKG)_DEPS     := cc qtbase qtdeclarative

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtquickcontrols2.mk
+++ b/plugins/examples/qt5-freeze/qtquickcontrols2.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtquickcontrols2,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtquickcontrols2,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtquickcontrols2,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative
+$(PKG)_DEPS     := cc qtbase qtdeclarative

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtscript.mk
+++ b/plugins/examples/qt5-freeze/qtscript.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtscript,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtscript,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtscript,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase
+$(PKG)_DEPS     := cc qtbase

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtscxml.mk
+++ b/plugins/examples/qt5-freeze/qtscxml.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtscxml,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtscxml,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtscxml,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative
+$(PKG)_DEPS     := cc qtbase qtdeclarative

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtsensors.mk
+++ b/plugins/examples/qt5-freeze/qtsensors.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtsensors,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtsensors,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtsensors,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase
+$(PKG)_DEPS     := cc qtbase

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtserialbus.mk
+++ b/plugins/examples/qt5-freeze/qtserialbus.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtserialbus,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtserialbus,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtserialbus,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtserialport
+$(PKG)_DEPS     := cc qtbase qtserialport

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtserialport.mk
+++ b/plugins/examples/qt5-freeze/qtserialport.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtserialport,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtserialport,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtserialport,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase
+$(PKG)_DEPS     := cc qtbase

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtsvg.mk
+++ b/plugins/examples/qt5-freeze/qtsvg.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtsvg,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtsvg,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtsvg,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase
+$(PKG)_DEPS     := cc qtbase

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qttools.mk
+++ b/plugins/examples/qt5-freeze/qttools.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qttools,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qttools,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qttools,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtactiveqt qtbase qtdeclarative
+$(PKG)_DEPS     := cc qtactiveqt qtbase qtdeclarative

 $(PKG)_TEST_DIR := $(dir $(lastword $(MAKEFILE_LIST)))/qttools-test

--- a/plugins/examples/qt5-freeze/qttranslations.mk
+++ b/plugins/examples/qt5-freeze/qttranslations.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qttranslations,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qttranslations,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qttranslations,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qttools
+$(PKG)_DEPS     := cc qtbase qttools

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtvirtualkeyboard.mk
+++ b/plugins/examples/qt5-freeze/qtvirtualkeyboard.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtvirtualkeyboard,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtvirtualkeyboard,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtvirtualkeyboard,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg
+$(PKG)_DEPS     := cc qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtwebchannel.mk
+++ b/plugins/examples/qt5-freeze/qtwebchannel.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtwebchannel,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtwebchannel,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtwebchannel,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative qtwebsockets
+$(PKG)_DEPS     := cc qtbase qtdeclarative qtwebsockets

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtwebkit.mk
+++ b/plugins/examples/qt5-freeze/qtwebkit.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtwebkit,$(qtbase_FILE))
 $(PKG)_URL       = $(subst /submodules/,/,$(subst official_releases/qt,community_releases,$(subst qtbase,qtwebkit,$(qtbase_URL))))
-$(PKG)_DEPS     := gcc qtbase qtmultimedia sqlite
+$(PKG)_DEPS     := cc qtbase qtmultimedia sqlite

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtwebsockets.mk
+++ b/plugins/examples/qt5-freeze/qtwebsockets.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtwebsockets,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtwebsockets,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtwebsockets,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase
+$(PKG)_DEPS     := cc qtbase

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtwebview.mk
+++ b/plugins/examples/qt5-freeze/qtwebview.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtwebview,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtwebview,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtwebview,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase
+$(PKG)_DEPS     := cc qtbase

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtwinextras.mk
+++ b/plugins/examples/qt5-freeze/qtwinextras.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtwinextras,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtwinextras,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtwinextras,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase qtdeclarative qtmultimedia
+$(PKG)_DEPS     := cc qtbase qtdeclarative qtmultimedia

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/examples/qt5-freeze/qtxmlpatterns.mk
+++ b/plugins/examples/qt5-freeze/qtxmlpatterns.mk
@ -10,7 +10,7 @@ $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST
 $(PKG)_SUBDIR    = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR))
 $(PKG)_FILE      = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE))
 $(PKG)_URL       = $(subst qtbase,qtxmlpatterns,$(qtbase_URL))
-$(PKG)_DEPS     := gcc qtbase
+$(PKG)_DEPS     := cc qtbase

 define $(PKG)_UPDATE
    echo $(qtbase_VERSION)
--- a/plugins/gcc4/gcc4.mk
+++ b/plugins/gcc4/gcc4.mk
@ -11,7 +11,7 @@ $(PKG)_FILE     := gcc-$($(PKG)_VERSION).tar.bz2
 $(PKG)_PATCHES  := $(basename $(lastword $(MAKEFILE_LIST))).patch
 $(PKG)_URL      := https://ftp.gnu.org/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://www.mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := binutils mingw-w64
+$(PKG)_DEPS     := binutils mingw-w64 $(addprefix $(BUILD)~,cloog gmp isl mpc mpfr)

 $(PKG)_FILE_$(BUILD) :=

--- a/plugins/go/go-native.mk
+++ b/plugins/go/go-native.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64
 $(PKG)_SUBDIR   := go
 $(PKG)_FILE     := go$($(PKG)_VERSION).src.tar.gz
 $(PKG)_URL      := https://storage.googleapis.com/golang/$($(PKG)_FILE)
-$(PKG)_DEPS_$(BUILD) :=
+$(PKG)_DEPS     :=
 $(PKG)_TARGETS  := $(BUILD)

 define $(PKG)_UPDATE
--- a/plugins/go/go.mk
+++ b/plugins/go/go.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623
 $(PKG)_SUBDIR   := go
 $(PKG)_FILE     := go$($(PKG)_VERSION).src.tar.gz
 $(PKG)_URL      := https://storage.googleapis.com/golang/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
+$(PKG)_DEPS     := $(BUILD)~go-native

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://golang.org/dl/' | \
--- a/plugins/luarocks/llthreads2.mk
+++ b/plugins/luarocks/llthreads2.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 8c6fc7966cdcc15ae2f89f66ae72f6727a985e7d254f139ecf75a50956a3e
 $(PKG)_SUBDIR   := lua-$(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := https://github.com/moteus/lua-llthreads2/archive/v$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := gcc luarocks
+$(PKG)_DEPS     := cc luarocks

 define $(PKG)_UPDATE
    $(call MXE_GET_GITHUB_TAGS, moteus/lua-llthreads2, v)
--- a/plugins/luarocks/lpeg.mk
+++ b/plugins/luarocks/lpeg.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 62d9f7a9ea3c1f215c77e0cadd8534c6ad9af0fb711c3f89188a8891c72f0
 $(PKG)_SUBDIR   := lpeg-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := http://www.inf.puc-rio.br/~roberto/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc luarocks
+$(PKG)_DEPS     := cc luarocks

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'http://www.inf.puc-rio.br/~roberto/lpeg/' | \
--- a/plugins/luarocks/lua-rapidjson.mk
+++ b/plugins/luarocks/lua-rapidjson.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 10783d8633df3f50b1ad33c7de89d2a94a7d9cf45e2ce5217d0d2d5e77396
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := https://github.com/xpol/lua-rapidjson/archive/v$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := gcc luarocks
+$(PKG)_DEPS     := cc luarocks

 define $(PKG)_UPDATE
    $(call MXE_GET_GITHUB_TAGS, xpol/lua-rapidjson, v)
--- a/plugins/luarocks/luarocks.mk
+++ b/plugins/luarocks/luarocks.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 68e38feeb66052e29ad1935a71b875194ed8b9c67c2223af5f4d4e3e2464e
 $(PKG)_SUBDIR   := luarocks-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := https://keplerproject.github.io/luarocks/releases/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc lua
+$(PKG)_DEPS     := cc lua $(BUILD)~lua

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://keplerproject.github.io/luarocks/releases/' | \
--- a/plugins/luarocks/luasocket.mk
+++ b/plugins/luarocks/luasocket.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 8b67d9b5b545e1b694753dab7bd6cdbc24c290f2b21ba1e14c77b32817ea1
 $(PKG)_SUBDIR   := luasocket-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := https://github.com/diegonehab/luasocket/archive/v$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := gcc luarocks
+$(PKG)_DEPS     := cc luarocks

 define $(PKG)_UPDATE
    $(call MXE_GET_GITHUB_TAGS, diegonehab/luasocket, v)
--- a/plugins/luarocks/luv.mk
+++ b/plugins/luarocks/luv.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := fab5ba54f141711afc432216d03f3664710798204c78a2a7414479f10b2b2
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := https://github.com/luvit/luv/releases/download/1.9.0-1/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc libuv luarocks
+$(PKG)_DEPS     := cc libuv luarocks

 define $(PKG)_UPDATE
    $(call MXE_GET_GITHUB_TAGS, luvit/luv)
--- a/plugins/native/glib2-macports.mk
+++ b/plugins/native/glib2-macports.mk
@ -11,6 +11,7 @@ $(PKG)_FILE     := glib2-$($(PKG)_VERSION)_0.darwin_16.x86_64.tbz2
 $(PKG)_URL      := https://packages.macports.org/glib2/glib2-$($(PKG)_VERSION)_0.darwin_16.x86_64.tbz2
 $(PKG)_DEPS     :=
 $(PKG)_TARGETS  := $(BUILD)
+$(PKG)_TYPE     := source-only

 define $(PKG)_UPDATE
    echo 'manually update glib2-macports as necessary' >&2;
--- a/plugins/native/patch.mk
+++ b/plugins/native/patch.mk
@ -13,6 +13,9 @@ $(PKG)_OWNER    := https://github.com/tonytheodore
 $(PKG)_TARGETS  := $(BUILD)
 $(PKG)_DEPS     :=

+# recursive variable so always use literal instead of $(PKG)
+MXE_REQS_PKGS   += $(BUILD)~patch
+
 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://ftp.gnu.org/gnu/patch/?C=M;O=D' | \
    $(SED) -n 's,.*<a href="patch-\([0-9][^"]*\)\.tar.*,\1,p' | \
--- a/plugins/qt4/qt4-overlay.mk
+++ b/plugins/qt4/qt4-overlay.mk
@ -3,9 +3,9 @@
 # override relevant vtk and qwt variables to build against Qt 4 instead of 5

 PKG               := vtk
-$(PKG)_DEPS       := gcc hdf5 qt libpng expat libxml2 jsoncpp tiff freetype lz4 hdf5 libharu glew
+$(PKG)_DEPS       := cc hdf5 qt libpng expat libxml2 jsoncpp tiff freetype lz4 hdf5 libharu glew
 $(PKG)_QT_VERSION := 4

 PKG               := qwt
-$(PKG)_DEPS       := gcc qt
+$(PKG)_DEPS       := cc qt
 $(PKG)_QT_DIR     := qt
--- a/plugins/tcl.tk/tcl.mk
+++ b/plugins/tcl.tk/tcl.mk
@ -2,4 +2,4 @@

 PKG             := tcl
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
-$(PKG)_DEPS     := gcc zlib
+$(PKG)_DEPS     := cc zlib
--- a/plugins/tcl.tk/tk.mk
+++ b/plugins/tcl.tk/tk.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 08f99df85e5dc9c4271762163c6aabb962c8b297dc5c4c1af8bdd05fc2dd2
 $(PKG)_SUBDIR   := tk$($(PKG)_VERSION)
 $(PKG)_FILE     := tk$($(PKG)_VERSION)-src.tar.gz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/tcl/Tcl/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc tcl
+$(PKG)_DEPS     := cc tcl

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://sourceforge.net/projects/tcl/files/Tcl/' | \
--- a/plugins/tcl.tk/tktable.mk
+++ b/plugins/tcl.tk/tktable.mk
@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := fb9fcedd2c1e252653225ac235d50cad01083b6851206bb0e5e63ecfa575f
 $(PKG)_SUBDIR   := TkTable.$($(PKG)_VERSION)
 $(PKG)_FILE     := TkTable.$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://sourceforge.net/projects/minsky/files/Sources/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc tk
+$(PKG)_DEPS     := cc tk

 # Note, the official tktable project at
 # https://sourceforge.net/projects/tktable/ appears to be abandoned,
--- a/src/a52dec.mk
+++ b/src/a52dec.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865e
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://liba52.sourceforge.io/files/$(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := cc

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://liba52.sourceforge.io/downloads.html' | \
--- a/src/agg.mk
+++ b/src/agg.mk
@ -10,7 +10,7 @@ $(PKG)_SUBDIR   := agg-$($(PKG)_VERSION)
 $(PKG)_FILE     := agg-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.antigrain.com/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://web.archive.org/web/20170111090029/www.antigrain.com/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc freetype sdl
+$(PKG)_DEPS     := cc freetype sdl

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'http://www.antigrain.com/download/index.html' | \
--- a/src/alure.mk
+++ b/src/alure.mk
@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 465e6adae68927be3a023903764662d64404e40c4c152d160e3a8838b1d70
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://kcat.strangesoft.net/alure-releases/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc flac libsndfile mpg123 ogg openal vorbis
+$(PKG)_DEPS     := cc flac libsndfile mpg123 ogg openal vorbis

 define $(PKG)_UPDATE
    $(WGET) -q -O- http://repo.or.cz/w/alure.git/tags | \
--- a/src/apr-util.mk
+++ b/src/apr-util.mk
@ -10,7 +10,7 @@ $(PKG)_SUBDIR   := apr-util-$($(PKG)_VERSION)
 $(PKG)_FILE     := apr-util-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://archive.apache.org/dist/apr/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://mirror.apache-kr.org/apr/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc apr expat libiconv
+$(PKG)_DEPS     := cc apr expat libiconv

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://apr.apache.org/download.cgi' | \
--- a/src/apr.mk
+++ b/src/apr.mk
@ -10,7 +10,7 @@ $(PKG)_SUBDIR   := apr-$($(PKG)_VERSION)
 $(PKG)_FILE     := apr-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://archive.apache.org/dist/apr/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://mirror.apache-kr.org/apr/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := cc

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://apr.apache.org/download.cgi' | \
--- a/src/armadillo.mk
+++ b/src/armadillo.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 63845e36235f2bd78b4f6890fe5013b6ce51a4e92e3176b20bbc6631b3400
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/arma/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc hdf5 openblas
+$(PKG)_DEPS     := cc hdf5 openblas

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://sourceforge.net/projects/arma/files/' | \
--- a/src/aspell.mk
+++ b/src/aspell.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc gettext
+$(PKG)_DEPS     := cc gettext

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://ftp.gnu.org/gnu/aspell/' | \
--- a/src/assimp.mk
+++ b/src/assimp.mk
@ -7,7 +7,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 3.2
 $(PKG)_CHECKSUM := 187f825c563e84b1b17527a4da0351aa3d575dfd696a9d204ae4bb19ee7df94a
 $(PKG)_GH_CONF  := assimp/assimp/tags, v
-$(PKG)_DEPS     := gcc boost
+$(PKG)_DEPS     := cc boost

 define $(PKG)_BUILD
    cd '$(BUILD_DIR)' && $(TARGET)-cmake \
--- a/src/atk.mk
+++ b/src/atk.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae
 $(PKG)_SUBDIR   := atk-$($(PKG)_VERSION)
 $(PKG)_FILE     := atk-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://download.gnome.org/sources/atk/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc gettext glib
+$(PKG)_DEPS     := cc gettext glib

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://git.gnome.org/browse/atk/refs/tags' | \
--- a/src/atkmm.mk
+++ b/src/atkmm.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := bfbf846b409b4c5eb3a52fa32a13d86936021969406b3dcafd4dd05abd70f
 $(PKG)_SUBDIR   := atkmm-$($(PKG)_VERSION)
 $(PKG)_FILE     := atkmm-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://download.gnome.org/sources/atkmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc atk glibmm
+$(PKG)_DEPS     := cc atk glibmm

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://git.gnome.org/browse/atkmm/refs/tags' | \
--- a/src/aubio.mk
+++ b/src/aubio.mk
@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 1cc58e0fed2b9468305b198ad06b889f228b797a082c2ede716dc30fcb4f8
 $(PKG)_SUBDIR   := aubio-$($(PKG)_VERSION)
 $(PKG)_FILE     := aubio-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://www.aubio.org/pub/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc ffmpeg fftw jack libsamplerate libsndfile waf
+$(PKG)_DEPS     := cc ffmpeg fftw jack libsamplerate libsndfile $(BUILD)~waf

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://www.aubio.org/download' | \
--- a/src/autotools.mk
+++ b/src/autotools.mk
@ -6,3 +6,4 @@ $(PKG)_DESCR    := Dependency package to ensure the autotools work
 $(PKG)_VERSION  := 1
 $(PKG)_DEPS     := libtool pkgconf
 $(PKG)_TARGETS  := $(BUILD)
+$(PKG)_TYPE     := meta
--- a/src/bfd.mk
+++ b/src/bfd.mk
@ -10,7 +10,7 @@ $(PKG)_SUBDIR    = $(binutils_SUBDIR)
 $(PKG)_FILE      = $(binutils_FILE)
 $(PKG)_URL       = $(binutils_URL)
 $(PKG)_URL_2     = $(binutils_URL_2)
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := cc

 define $(PKG)_UPDATE
    echo $(binutils_VERSION)
--- a/src/binutils.mk
+++ b/src/binutils.mk
@ -9,7 +9,7 @@ $(PKG)_SUBDIR   := binutils-$($(PKG)_VERSION)
 $(PKG)_FILE     := binutils-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://ftp.gnu.org/gnu/binutils/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://ftpmirror.gnu.org/binutils/$($(PKG)_FILE)
-$(PKG)_DEPS     := pkgconf
+$(PKG)_DEPS     :=

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://ftp.gnu.org/gnu/binutils/?C=M;O=D' | \
@ -37,5 +37,3 @@ define $(PKG)_BUILD

    rm -f $(addprefix $(PREFIX)/$(TARGET)/bin/, ar as dlltool ld ld.bfd nm objcopy objdump ranlib strip)
 endef
-
-$(PKG)_BUILD_$(BUILD) :=
--- a/src/blas.mk
+++ b/src/blas.mk
@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := ef7d775d380f255d1902bce374ff7c8a594846454fcaeae552292168af1ac
 $(PKG)_SUBDIR   := BLAS-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
 $(PKG)_URL      := http://www.netlib.org/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc openblas
+$(PKG)_DEPS     := cc openblas

 $(PKG)_MESSAGE  :=*** blas has been replaced by openblas ***

--- a/src/boost.mk
+++ b/src/boost.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933f
 $(PKG)_SUBDIR   := boost_$(subst .,_,$($(PKG)_VERSION))
 $(PKG)_FILE     := boost_$(subst .,_,$($(PKG)_VERSION)).tar.bz2
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/boost/boost/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc bzip2 expat zlib
+$(PKG)_DEPS     := cc bzip2 expat zlib

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://www.boost.org/users/download/' | \
--- a/src/box2d.mk
+++ b/src/box2d.mk
@ -6,7 +6,7 @@ $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 2.3.1
 $(PKG)_CHECKSUM := 75d62738b13d2836cd56647581b6e574d4005a6e077ddefa5d727d445d649752
 $(PKG)_GH_CONF  := erincatto/Box2D/tags, v
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := cc

 define $(PKG)_BUILD
    cd '$(BUILD_DIR)' && $(TARGET)-cmake \
--- a/src/bullet.mk
+++ b/src/bullet.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 67e4c9eb76f7adf99501d726d8ad5e9b525dfd0843fbce9ca73aaca4ba9ec
 $(PKG)_SUBDIR   := bullet-$($(PKG)_VERSION)
 $(PKG)_FILE     := bullet-$($(PKG)_VERSION).tgz
 $(PKG)_URL      := https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/bullet/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := cc

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://code.google.com/p/bullet/downloads/list?sort=-uploaded' | \
--- a/src/bzip2.mk
+++ b/src/bzip2.mk
@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d
 $(PKG)_SUBDIR   := bzip2-$($(PKG)_VERSION)
 $(PKG)_FILE     := bzip2-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.bzip.org/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := cc

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'http://www.bzip.org/downloads.html' | \
--- a/src/cairo.mk
+++ b/src/cairo.mk
@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := deddf31e196e826e7790bbbf7d0f4b3fd15df243aa48511b349f1791b96be
 $(PKG)_SUBDIR   := cairo-$($(PKG)_VERSION)
 $(PKG)_FILE     := cairo-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://cairographics.org/snapshots/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc fontconfig freetype-bootstrap glib libpng lzo pixman zlib
+$(PKG)_DEPS     := cc fontconfig freetype-bootstrap glib libpng lzo pixman zlib

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://cairographics.org/releases/?C=M;O=D' | \
--- a/src/cairomm.mk
+++ b/src/cairomm.mk
@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := ccf677098c1e08e189add0bd146f78498109f202575491a82f1815b6bc280
 $(PKG)_SUBDIR   := cairomm-$($(PKG)_VERSION)
 $(PKG)_FILE     := cairomm-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://cairographics.org/releases/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc cairo libsigc++
+$(PKG)_DEPS     := cc cairo libsigc++

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://cairographics.org/releases/?C=M;O=D' | \
--- a/src/cblas.mk
+++ b/src/cblas.mk
@ -9,7 +9,7 @@ $(PKG)_SUBDIR   := CBLAS
 $(PKG)_FILE     := $(PKG).tgz
 $(PKG)_URL      := http://www.netlib.org/blas/blast-forum/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://ftp.eq.uc.pt/software/math/netlib/blas/blast-forum/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc openblas
+$(PKG)_DEPS     := cc openblas

 $(PKG)_MESSAGE  :=*** cblas has been replaced by openblas ***

--- a/src/cc.mk
+++ b/src/cc.mk
@ -0,0 +1,9 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG             := cc
+$(PKG)_WEBSITE  := https://mxe.cc
+$(PKG)_DESCR    := Dependency package for cross libraries
+$(PKG)_VERSION  := 1
+$(PKG)_DEPS     := gcc
+$(PKG)_OO_DEPS   = pkgconf $(MXE_REQS_PKGS)
+$(PKG)_TYPE     := meta
--- a/src/ccfits.mk
+++ b/src/ccfits.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 938ecd25239e65f519b8d2b50702416edc723de5f0a5387cceea8c4004a44
 $(PKG)_SUBDIR   := CCfits
 $(PKG)_FILE     := CCfits-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://heasarc.gsfc.nasa.gov/fitsio/CCfits/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc cfitsio
+$(PKG)_DEPS     := cc cfitsio

 define $(PKG)_UPDATE
    $(WGET) -q -O- "https://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/" | \
--- a/src/cegui.mk
+++ b/src/cegui.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 14b3da7f1f89693192cd9afbf2126f4519508245ed156de893828e31ce676
 $(PKG)_SUBDIR   := $(PKG)-$(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://bitbucket.org/$(PKG)/$(PKG)/get/$($(PKG)_VERSION).tar.bz2
-$(PKG)_DEPS     := gcc expat freeglut freeimage freetype fribidi glew \
+$(PKG)_DEPS     := cc expat freeglut freeimage freetype fribidi glew \
                   glfw3 glm libxml2 minizip pcre xerces

 define $(PKG)_UPDATE
--- a/src/cfitsio.mk
+++ b/src/cfitsio.mk
@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := a556ac7ea1965545dcb4d41cfef8e4915eeb8c0faa1b52f7ff70870f8bb57
 $(PKG)_SUBDIR   := cfitsio
 $(PKG)_FILE     := cfitsio$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := cc

 define $(PKG)_UPDATE
    $(WGET) -q -O- "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/?C=M;O=D" | \
--- a/src/cgal.mk
+++ b/src/cgal.mk
@ -10,7 +10,7 @@ $(PKG)_GH_CONF  := CGAL/cgal/tags, releases%2FCGAL-
 $(PKG)_SUBDIR   := CGAL-$($(PKG)_VERSION)
 $(PKG)_FILE     := CGAL-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://github.com/CGAL/cgal/releases/download/releases/$($(PKG)_SUBDIR)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc boost gmp mpfr qt5
+$(PKG)_DEPS     := cc boost gmp mpfr qt5

 define $(PKG)_BUILD
    cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \
--- a/src/check.mk
+++ b/src/check.mk
@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := f5f50766aa6f8fe5a2df752666ca01a950add45079aa06416b83765b1cf71
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := cc

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://sourceforge.net/projects/check/files/check/' | \
--- a/src/chipmunk.mk
+++ b/src/chipmunk.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := c51f0e3a30770f6b940de3228bee40a871aaf7611a1b5ec546a7d2b9e1041
 $(PKG)_SUBDIR   := Chipmunk2D-Chipmunk-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/slembcke/Chipmunk2D/archive/Chipmunk-$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := cc

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://github.com/slembcke/Chipmunk2D/releases' | \
--- a/src/chromaprint.mk
+++ b/src/chromaprint.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := 6b14d7ea4964581b73bd3f8038c8857c01e446421c1ae99cbbf64de26b47c
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://bitbucket.org/acoustid/chromaprint/downloads/$(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := gcc ffmpeg
+$(PKG)_DEPS     := cc ffmpeg

 define $(PKG)_UPDATE
    echo 'TODO: Updates for package chromaprint need to be written.' >&2;
--- a/src/cimg.mk
+++ b/src/cimg.mk
@ -9,7 +9,7 @@ $(PKG)_CHECKSUM := c2a3c62d05d1e322afa6afae086cf96df82a3a13b839e9bf1cedcb014d921
 $(PKG)_SUBDIR   := CImg-$($(PKG)_VERSION)
 $(PKG)_FILE     := CImg_$($(PKG)_VERSION).zip
 $(PKG)_URL      := http://cimg.eu/files/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc fftw imagemagick jpeg libpng opencv openexr tiff zlib
+$(PKG)_DEPS     := cc fftw imagemagick jpeg libpng opencv openexr tiff zlib

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'http://cimg.eu/files/' | \
--- a/src/cloog.mk
+++ b/src/cloog.mk
@ -10,7 +10,7 @@ $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://www.bastoul.net/cloog/pages/download/$($(PKG)_FILE)
 $(PKG)_URL_2    := https://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc gmp isl
+$(PKG)_DEPS     := cc gmp isl

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://www.bastoul.net/cloog/download.php' | \
--- a/src/cmake-conf.mk
+++ b/src/cmake-conf.mk
@ -4,7 +4,9 @@ PKG            := cmake-conf
 $(PKG)_VERSION := 1
 $(PKG)_UPDATE  := echo 1
 $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
+$(PKG)_DEPS    := $(BUILD)~$(PKG)
 $(PKG)_FILE_DEPS := $(wildcard $(PWD)/src/cmake/conf/*)
+$(PKG)_DEPS_$(BUILD) := cmake

 define $(PKG)_BUILD
    # create the CMake toolchain file using template
--- a/src/cminpack.mk
+++ b/src/cminpack.mk
@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 3b517bf7dca68cc9a882883db96dac0a0d37d72aba6dfb0c9c7e78e67af50
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://devernay.free.fr/hacks/cminpack/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := cc

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'http://devernay.free.fr/hacks/cminpack/index.html' | \
--- a/Show More
+++ b/Show More