Mercurial > mxe-octave

changeset 4795:f39017b331bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
only download msys2 source packages if building dist target * Makefile.in: Don't add $(MSYS2_SOURCES) to PKGS. * binary-dist-rules.mk (WINDOWS_BINARY_DIST_DEPS): Handle msys2-sources target the same as the msys-base-sources target.
author John W. Eaton <jwe@octave.org>
date Wed, 15 Aug 2018 17:01:24 -0400
parents 0de4e167d902
children 8fd91da9df90
files Makefile.in binary-dist-rules.mk
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Wed Aug 15 16:58:21 2018 -0400
+++ b/Makefile.in	Wed Aug 15 17:01:24 2018 -0400
@@ -454,7 +454,6 @@
     MSYS2_ARCH = $(shell echo $(TARGET) | $(SED) -n 's|\([^-]*\).*|\1|p')
     MSYS2_PACKAGES := $(shell $(SED) -n 's/^.* class="package">\([^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html' | $(GREP) msys2-)
     MSYS2_SOURCES := $(addprefix src-,$(MSYS2_PACKAGES))
-    PKGS += $(MSYS2_SOURCES)
     MSYS2_BASE_URL := https://sourceforge.net/projects/msys2/files/REPOS/MSYS2
     MSYS2_URL := $(MSYS2_BASE_URL)/$(MSYS2_ARCH)
     MSYS2_SRC_URL := $(MSYS2_BASE_URL)/Sources
--- a/binary-dist-rules.mk	Wed Aug 15 16:58:21 2018 -0400
+++ b/binary-dist-rules.mk	Wed Aug 15 17:01:24 2018 -0400
@@ -29,7 +29,8 @@
 
   ifeq ($(USE_MSYS2),yes)
     WINDOWS_BINARY_DIST_DEPS += \
-      msys2
+      msys2 \
+      msys2-sources
 
     ifeq ($(ENABLE_WINDOWS_64),yes)
       OCTAVE_ADD_PATH := /mingw64