summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2017-11-26 23:01:43 (GMT)
committerTony Theodore <tonyt@logyst.com>2017-12-22 21:19:00 (GMT)
commit7c7e3d5f348a9ef160e73e41cc028d765fb3e18d (patch)
tree52a60878bec0fff56fa7b7cc2a1f722496cbef44
parent05be27ff7c67169fb168fd9deac28e718ff415b1 (diff)
downloadmxe-7c7e3d5f348a9ef160e73e41cc028d765fb3e18d.zip
mxe-7c7e3d5f348a9ef160e73e41cc028d765fb3e18d.tar.gz
mxe-7c7e3d5f348a9ef160e73e41cc028d765fb3e18d.tar.bz2
rename archive pkg-type to source-only for clarity
archive could imply a deprecated package
-rw-r--r--Makefile4
-rw-r--r--plugins/native/glib2-macports.mk2
-rw-r--r--src/googlemock.mk2
-rw-r--r--src/googletest.mk2
4 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index b2c5e7e..1060489 100644
--- a/Makefile
+++ b/Makefile
@@ -425,7 +425,7 @@ MXE_REQS_PKGS =
# distinguish between deliberately empty rules and disabled ones
# used in build-matrix
-VIRTUAL_PKG_TYPES := archive meta
+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
@@ -557,7 +557,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)
diff --git a/plugins/native/glib2-macports.mk b/plugins/native/glib2-macports.mk
index 3ae26a9..f09eaf2 100644
--- a/plugins/native/glib2-macports.mk
+++ b/plugins/native/glib2-macports.mk
@@ -11,7 +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 := archive
+$(PKG)_TYPE := source-only
define $(PKG)_UPDATE
echo 'manually update glib2-macports as necessary' >&2;
diff --git a/src/googlemock.mk b/src/googlemock.mk
index 3bd5e65..537316c 100644
--- a/src/googlemock.mk
+++ b/src/googlemock.mk
@@ -9,4 +9,4 @@ $(PKG)_CHECKSUM := 3f20b6acb37e5a98e8c4518165711e3e35d47deb6cdb5a4dd4566563b5efd
$(PKG)_GH_CONF := google/googlemock/tags, release-
$(PKG)_DEPS :=
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
-$(PKG)_TYPE := archive
+$(PKG)_TYPE := source-only
diff --git a/src/googletest.mk b/src/googletest.mk
index d3171a7..84139b1 100644
--- a/src/googletest.mk
+++ b/src/googletest.mk
@@ -9,4 +9,4 @@ $(PKG)_CHECKSUM := f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c9668701
$(PKG)_GH_CONF := google/googletest/tags, release-
$(PKG)_DEPS :=
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
-$(PKG)_TYPE := archive
+$(PKG)_TYPE := source-only