[many ports] Apply host dependencies (#16479)

* [vcpkg] Add VCPKG_HOST_TRIPLET. Improve vcpkg.schema.json * [many ports] Apply host dependencies * [yasm-tool] Revert yasm-tool changes to split into PR #16478 * [many ports] Add versions * [vcpkg.cmake] Revert change applied in other PR * [boost-modular-build-helper] Merge from master Co-authored-by: Robert Schumacher <[email protected]>
microsoft · Mar 26, 2021 · b5bb151 · b5bb151
1 parent 6a63eca
commit b5bb151
Show file tree

Hide file tree

Showing 125 changed files with 804 additions and 312 deletions.
diff --git a/ports/ampl-mp/portfile.cmake b/ports/ampl-mp/portfile.cmake
@@ -16,12 +16,11 @@ vcpkg_from_github(
         install-targets.patch
 )
 
-if (VCPKG_TARGET_IS_WINDOWS AND (TRIPLET_SYSTEM_ARCH STREQUAL "arm" OR TRIPLET_SYSTEM_ARCH STREQUAL "arm64"))
-    set(EXPECTED_EXE ${CURRENT_INSTALLED_DIR}/../x86-windows/tools/${PORT}/gen-expr-info.exe)
-    if (NOT EXISTS ${EXPECTED_EXE})
-        message(FATAL_ERROR "Please install ${PORT}:x86-windows first.")
+if (NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET)
+    set(ARITHCHK_EXEC ${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/gen-expr-info${VCPKG_HOST_EXECUTABLE_SUFFIX})
+    if (NOT EXISTS "${ARITHCHK_EXEC}")
+        message(FATAL_ERROR "Expected ${ARITHCHK_EXEC} to exist.")
     endif()
-    set(ARITHCHK_EXEC ${EXPECTED_EXE})
 endif()
 
 vcpkg_configure_cmake(

diff --git a/ports/ampl-mp/vcpkg.json b/ports/ampl-mp/vcpkg.json
@@ -1,10 +1,15 @@
 {
   "name": "ampl-mp",
   "version-string": "2020-11-11",
+  "port-version": 1,
   "description": "An open-source library for mathematical programming",
   "homepage": "https://github.com/ampl/mp",
   "supports": "!uwp",
   "dependencies": [
-    "ampl-asl"
+    "ampl-asl",
+    {
+      "name": "ampl-mp",
+      "host": true
+    }
   ]
 }
diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake
@@ -16,7 +16,10 @@ string(REPLACE
 file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
+    message(FATAL_ERROR "boost-atomic requires a newer version of vcpkg in order to build.")
+endif()
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json
@@ -1,15 +1,22 @@
 {
   "name": "boost-atomic",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost atomic module",
   "homepage": "https://github.com/boostorg/atomic",
   "dependencies": [
     "boost-align",
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-integer",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-predef",
     "boost-preprocessor",
     "boost-static-assert",

diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
+    message(FATAL_ERROR "boost-chrono requires a newer version of vcpkg in order to build.")
+endif()
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-chrono/vcpkg.json b/ports/boost-chrono/vcpkg.json
@@ -1,15 +1,22 @@
 {
   "name": "boost-chrono",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost chrono module",
   "homepage": "https://github.com/boostorg/chrono",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-detail",
     "boost-integer",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-move",
     "boost-mpl",
     "boost-predef",

diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "boost-concept-check",
   "version-string": "1.75.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Boost concept_check module",
   "homepage": "https://github.com/boostorg/concept_check",
   "dependencies": [

diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
+    message(FATAL_ERROR "boost-container requires a newer version of vcpkg in order to build.")
+endif()
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json
@@ -1,17 +1,24 @@
 {
   "name": "boost-container",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost container module",
   "homepage": "https://github.com/boostorg/container",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-container-hash",
     "boost-core",
     "boost-integer",
     "boost-intrusive",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-move",
     "boost-static-assert",
     "boost-type-traits",

diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake
@@ -14,7 +14,10 @@ string(REPLACE "import ../../config/checks/config" "import config/checks/config"
 file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
+    message(FATAL_ERROR "boost-context requires a newer version of vcpkg in order to build.")
+endif()
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 configure_file(
     "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in"
     "${CURRENT_BUILDTREES_DIR}/vcpkg-b2-options.cmake"

diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json
@@ -1,18 +1,24 @@
 {
   "name": "boost-context",
   "version-string": "1.75.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Boost context module",
   "homepage": "https://github.com/boostorg/context",
   "supports": "!uwp & !emscripten",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-core",
     "boost-detail",
     "boost-integer",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-pool",
     "boost-predef",
     "boost-smart-ptr",

diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
+    message(FATAL_ERROR "boost-contract requires a newer version of vcpkg in order to build.")
+endif()
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-contract/vcpkg.json b/ports/boost-contract/vcpkg.json
@@ -1,19 +1,26 @@
 {
   "name": "boost-contract",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost contract module",
   "homepage": "https://github.com/boostorg/contract",
   "dependencies": [
     "boost-any",
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-core",
     "boost-detail",
     "boost-exception",
     "boost-function",
     "boost-function-types",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-mpl",
     "boost-optional",
     "boost-preprocessor",

diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
+    message(FATAL_ERROR "boost-coroutine requires a newer version of vcpkg in order to build.")
+endif()
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "boost-coroutine",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost coroutine module",
   "homepage": "https://github.com/boostorg/coroutine",
   "supports": "!arm & !uwp & !emscripten",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     {
       "name": "boost-context",
@@ -16,7 +20,10 @@
     "boost-detail",
     "boost-exception",
     "boost-integer",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-move",
     "boost-system",
     "boost-thread",

diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
+    message(FATAL_ERROR "boost-date-time requires a newer version of vcpkg in order to build.")
+endif()
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-date-time/vcpkg.json b/ports/boost-date-time/vcpkg.json
@@ -1,12 +1,16 @@
 {
   "name": "boost-date-time",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost date_time module",
   "homepage": "https://github.com/boostorg/date_time",
   "dependencies": [
     "boost-algorithm",
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-compatibility",
     "boost-config",
     "boost-core",
@@ -15,7 +19,10 @@
     "boost-io",
     "boost-lexical-cast",
     "boost-math",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-numeric-conversion",
     "boost-range",
     "boost-smart-ptr",

diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake
@@ -8,7 +8,10 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
+    message(FATAL_ERROR "boost-exception requires a newer version of vcpkg in order to build.")
+endif()
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})

diff --git a/ports/boost-exception/vcpkg.json b/ports/boost-exception/vcpkg.json
@@ -1,14 +1,21 @@
 {
   "name": "boost-exception",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost exception module",
   "homepage": "https://github.com/boostorg/exception",
   "dependencies": [
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     "boost-core",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-smart-ptr",
     "boost-tuple",
     "boost-type-traits",

diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake
@@ -13,7 +13,10 @@ string(REPLACE "import ../../config/checks/config" "import config/checks/config"
 file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}")
 file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config")
 
-include(${CURRENT_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
+if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)
+    message(FATAL_ERROR "boost-fiber requires a newer version of vcpkg in order to build.")
+endif()
+include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)
 boost_modular_build(SOURCE_PATH ${SOURCE_PATH})
 include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
 boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json
@@ -1,13 +1,17 @@
 {
   "name": "boost-fiber",
   "version-string": "1.75.0",
+  "port-version": 1,
   "description": "Boost fiber module",
   "homepage": "https://github.com/boostorg/fiber",
   "supports": "!osx & !uwp & !arm & !emscripten",
   "dependencies": [
     "boost-algorithm",
     "boost-assert",
-    "boost-build",
+    {
+      "name": "boost-build",
+      "host": true
+    },
     "boost-config",
     {
       "name": "boost-context",
@@ -21,7 +25,10 @@
     },
     "boost-format",
     "boost-intrusive",
-    "boost-modular-build-helper",
+    {
+      "name": "boost-modular-build-helper",
+      "host": true
+    },
     "boost-predef",
     "boost-smart-ptr",
     "boost-vcpkg-helpers"