diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-10-15 09:49:11 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-11-26 04:01:47 (GMT) |
| commit | cdb7e99dd692025819f4b6cd63791e52f09d1db7 (patch) | |
| tree | 28cc9d1eb3c1e4865abf9bea11a365d15bae6f22 /Makefile | |
| parent | d28c2c02270cf28ee3c59359ffaa5c3f0b78a7b6 (diff) | |
| download | mxe-cdb7e99dd692025819f4b6cd63791e52f09d1db7.zip mxe-cdb7e99dd692025819f4b6cd63791e52f09d1db7.tar.gz mxe-cdb7e99dd692025819f4b6cd63791e52f09d1db7.tar.bz2 | |
remove optional native pkgs and build-requirements target
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 2 insertions, 11 deletions
@@ -326,11 +326,6 @@ $(PREFIX)/installed/check-requirements: $(MAKEFILE) include $(patsubst %,$(TOP_DIR)/src/%.mk,$(PKGS)) -BUILD_PKGS := $(call set_create, \ - $(foreach PKG, \ - $(shell grep -l 'BUILD_$$(BUILD)' '$(TOP_DIR)/src/'*.mk | \ - $(SED) -n 's,.*src/\(.*\)\.mk,\1,p'), \ - $(if $(value $(call LOOKUP_PKG_RULE,$(PKG),BUILD,$(BUILD))), $(PKG)))) # create target sets for PKG_TARGET_RULE loop to avoid creating empty rules # and having to explicitly disable $(BUILD) for most packages @@ -356,10 +351,6 @@ PRINTF_FMT := printf '%-11s %-$(PKG_COL_WIDTH)s %-$(TARGET_COL_WIDTH)s %-1 .PHONY: download download: $(addprefix download-,$(PKGS)) -.PHONY: build-requirements -build-requirements: - @$(MAKE) -f '$(MAKEFILE)' $(BUILD_PKGS) MXE_TARGETS=$(BUILD) DONT_CHECK_REQUIREMENTS=true - define TARGET_RULE $(if $(findstring i686-pc-mingw32,$(1)), $(error Deprecated target specified: "$(1)". Please use \ @@ -709,7 +700,7 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) $(eval $(PKG)_BUILD_ONLY := $(false)) \ <td class="supported">✓</td>, \ <td class="unsupported">✗</td>)\n) \ - $(if $(call set_is_member,$(PKG),$(BUILD_PKGS)), \ + $(if $(call set_is_member,$(PKG),$($(BUILD)_PKGS)), \ $(eval $(PKG)_VIRTUAL := $(false)) \ <td class="supported">✓</td>, \ <td class="unsupported">✗</td>)\n \ @@ -731,7 +722,7 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) @echo '</th>' >> $@ @$(foreach TARGET,$(MXE_TARGET_LIST), \ echo '<th>$(words $($(TARGET)_PKGCOUNT))</th>' >> $@;) - @echo '<th>$(words $(BUILD_PKGS))</th>' >> $@ + @echo '<th>$(words $($(BUILD)_PKGS))</th>' >> $@ @echo '</tr>' >> $@ @echo '</tbody>' >> $@ @echo '</table>' >> $@ |