MSYS2 dependencies

docs/maintainers/vcpkg_acquire_msys.md

@@ -29,6 +29,10 @@ vcpkg_execute_required_process(
 )
 ```
 
+### Modifying vcpkg_acquire_msys
+A change to `vcpkg_acquire_msys` should be accompanied by an increment of `tool-msys` port's version.
+This ensures all the MSYS2 dependent ports are built with the same MSYS2 environment.
+
 ## Examples
 
 * [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake)

ports/ffmpeg/CONTROL

@@ -1,6 +1,6 @@
 Source: ffmpeg
-Version: 4.2-10
-Build-Depends: zlib
+Version: 4.2-11
+Build-Depends: zlib, tool-msys (windows)
 Homepage: https://ffmpeg.org
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
   FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.

ports/ffnvcodec/CONTROL

@@ -1,4 +1,5 @@
 Source: ffnvcodec
-Version: 9.1.23.1
+Version: 9.1.23.1-1
 Homepage: https://github.com/FFmpeg/nv-codec-headers
 Description: FFmpeg version of Nvidia Codec SDK headers.
+Build-Depends: tool-msys (windows)

ports/icu/CONTROL

@@ -1,5 +1,6 @@
 Source: icu
-Version: 67.1
+Version: 67.1-1
 Homepage: http://icu-project.org/apiref/icu4c/
 Description: Mature and widely used Unicode and localization library.
+Build-Depends: tool-msys (windows)
 Supports: !(arm|uwp)

ports/libpq/CONTROL

@@ -1,5 +1,5 @@
 Source: libpq
-Version: 12.2-2
+Version: 12.2-3
 Build-Depends: libpq[bonjour] (osx)
 Supports: !uwp
 Homepage: https://www.postgresql.org/
@@ -35,7 +35,7 @@ Build-Depends: tcl, libpq[core,client]
 Description: build the PL/Tcl procedural language(dynamic only?) (--with-tcl)
 
 Feature: nls
-Build-Depends: gettext
+Build-Depends: gettext, tool-msys (windows)
 Description: Native Language Support (--enable-nls[=LANGUAGES])
 
 Feature: kerberos

ports/libvpx/CONTROL

@@ -1,5 +1,6 @@
 Source: libvpx
-Version: 1.8.1-6
+Version: 1.8.1-7
 Homepage: https://github.com/webmproject/libvpx
 Description: The reference software implementation for the video coding formats VP8 and VP9.
+Build-Depends: tool-msys (windows)
 Supports: !(uwp&arm)

ports/tensorflow-cc/CONTROL

@@ -1,5 +1,5 @@
 Source: tensorflow-cc
-Version: 1.14-2
+Version: 1.14-3
 Description: Library for computation using data flow graphs for scalable machine learning
-Build-Depends: c-ares
+Build-Depends: c-ares, tool-msys (windows)
 Supports: !x86

ports/tool-meson/CONTROL

@@ -1,4 +1,5 @@
 Source: tool-meson
-Version: 0.54.2
+Version: 0.54.2-1
 Homepage: https://github.com/mesonbuild/meson
 Description: Meson build system
+Build-Depends: tool-msys (windows)

ports/tool-msys/CONTROL

@@ -0,0 +1,5 @@
+Source: tool-msys
+Version: 2019-05-24
+Homepage: https://www.msys2.org/
+Description: MSYS2 software distro and building platform for Windows
+Supports: windows

ports/tool-msys/portfile.cmake

@@ -0,0 +1,7 @@
+# This port represents a dependency on the MSYS2 build system.
+# In the future, it is expected that this port acquires and installs MSYS2.
+# Currently it is used to update MSYS2 installation and to rebuild the ports using vcpkg_acquire_msys.
+
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+vcpkg_acquire_msys(MSYS_ROOT)

scripts/cmake/vcpkg_acquire_msys.cmake

@@ -29,6 +29,10 @@
 ## )
 ## ```
 ##
+## ### Modifying vcpkg_acquire_msys
+## A change to `vcpkg_acquire_msys` should be accompanied by an increment of `tool-msys` port's version.
+## This ensures all the MSYS2 dependent ports are built with the same MSYS2 environment.
+##
 ## ## Examples
 ##
 ## * [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake)
@@ -72,7 +76,18 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
 
   set(PATH_TO_ROOT ${TOOLPATH}/${TOOLSUBPATH})
 
+  # the version of tool-msys port specifies "an epoch" of MSYS2 installation
+  if(EXISTS "${TOOLPATH}/${STAMP}" AND PORT STREQUAL tool-msys)
+    file(READ "${TOOLPATH}/${STAMP}" _vam_VERSION)
+    if(NOT _vam_VERSION STREQUAL PORT_VERSION)
+      file(REMOVE_RECURSE "${TOOLPATH}")
+    endif()
+  endif()
+
   if(NOT EXISTS "${TOOLPATH}/${STAMP}")
+    if(NOT PORT STREQUAL tool-msys)
+      message(FATAL_ERROR "vcpkg_acquire_msys() depends on tool-msys -- add 'tool-msys (windows)' to port's build dependencies")
+    endif()
 
     message(STATUS "Acquiring MSYS2...")
     vcpkg_download_distfile(ARCHIVE_PATH
@@ -99,10 +114,10 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
       WORKING_DIRECTORY ${TOOLPATH}
     )
     _execute_process(
-      COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -Syu --noconfirm"
+      COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "PATH=/usr/bin;pacman -Syu --noconfirm --cachedir \"${DOWNLOADS}\""
       WORKING_DIRECTORY ${TOOLPATH}
     )
-    file(WRITE "${TOOLPATH}/${STAMP}" "0")
+    file(WRITE "${TOOLPATH}/${STAMP}" "${PORT_VERSION}")
     message(STATUS "Acquiring MSYS2... OK")
   endif()
 
@@ -114,7 +129,7 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
     set(ENV{PATH} ${PATH_TO_ROOT}/usr/bin)
     vcpkg_execute_required_process(
       ALLOW_IN_DOWNLOAD_MODE
-      COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "pacman -S --noconfirm --needed ${_am_PACKAGES}"
+      COMMAND ${PATH_TO_ROOT}/usr/bin/bash.exe --noprofile --norc -c "pacman -S --noconfirm --cachedir \"${DOWNLOADS}\" --needed ${_am_PACKAGES}"
       WORKING_DIRECTORY ${TOOLPATH}
       LOGNAME msys-pacman-${TARGET_TRIPLET}
     )

toolsrc/src/vcpkg/build.cpp

@@ -376,6 +376,7 @@ namespace vcpkg::Build
         std::vector<System::CMakeVariable> variables{
             {"CMD", "BUILD"},
             {"PORT", scf.core_paragraph->name},
+            {"PORT_VERSION", scf.core_paragraph->version},
             {"CURRENT_PORT_DIR", scfl.source_location},
             {"TARGET_TRIPLET", triplet.canonical_name()},
             {"TARGET_TRIPLET_FILE", paths.get_triplet_file_path(triplet).u8string()},