Update macOS for January 2024 (#35617)

macOS 14.2.1 on amd64, 14.3 on arm64 XCode Console Tools 15.1 Other changes: macOS install is done from the installers rather than from the recovery partition readme.md is now written for a vcpkg-team audience vagrant is removed as a dependency so that discussion of how to persist the VMs between machines could be included arm64 is added using https://github.com/s-u/macosvm
microsoft · Jan 25, 2024 · cf20e29 · cf20e29
1 parent f45fd33
commit cf20e29
Show file tree

Hide file tree

Showing 25 changed files with 468 additions and 342 deletions.
diff --git a/ports/libgwenhywfar/vcpkg.json b/ports/libgwenhywfar/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "libgwenhywfar",
   "version-semver": "5.6.0",
-  "port-version": 4,
+  "port-version": 5,
   "description": "A helper library for networking and security applications and libraries",
   "homepage": "https://www.aquamaniac.de/rdm/",
-  "supports": "!windows",
+  "supports": "!windows & !(osx & arm64)",
   "dependencies": [
     "libgcrypt",
     {

diff --git a/ports/libopensp/opensp.pc.in b/ports/libopensp/opensp.pc.in
@@ -5,8 +5,8 @@ includedir=${prefix}/include/OpenSP
 
 Name: opensp
 Description: SGML parser algorithm library
-Version: @OPENSP_VERSION@
+Version: @VERSION@
 Libs: -L${libdir} -losp
 Libs.private: @EXTRA_LIBS@
 Cflags: -I${includedir}
-Cflags.private:
+Cflags.private:
diff --git a/ports/libopensp/portfile.cmake b/ports/libopensp/portfile.cmake
@@ -1,6 +1,7 @@
-set(OPENSP_VERSION 1.5.2)
-
-set(PATCHES opensp_1.5.2-13.diff)                   # http://deb.debian.org/debian/pool/main/o/opensp/opensp_1.5.2-13.diff.gz
+set(PATCHES
+    opensp_1.5.2-13.diff                   # http://deb.debian.org/debian/pool/main/o/opensp/opensp_1.5.2-13.diff.gz
+    use-cpp-using-declarations.patch
+)
 if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
     list(APPEND PATCHES windows_cmake_build.diff)   # https://invent.kde.org/packaging/craft-blueprints-kde/-/tree/master/libs/libopensp
 endif()
@@ -9,15 +10,15 @@ if (VCPKG_TARGET_IS_UWP)
 endif()
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://downloads.sourceforge.net/project/openjade/opensp/${OPENSP_VERSION}/OpenSP-${OPENSP_VERSION}.tar.gz"
-    FILENAME "OpenSP-${OPENSP_VERSION}.tar.gz"
+    URLS "https://downloads.sourceforge.net/project/openjade/opensp/${VERSION}/OpenSP-${VERSION}.tar.gz"
+    FILENAME "OpenSP-${VERSION}.tar.gz"
     SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
-    SOURCE_BASE ${OPENSP_VERSION}
+    SOURCE_BASE ${VERSION}
     PATCHES ${PATCHES}
 )
 

diff --git a/ports/libopensp/use-cpp-using-declarations.patch b/ports/libopensp/use-cpp-using-declarations.patch
@@ -0,0 +1,72 @@
+diff --git a/include/IList.h b/include/IList.h
+index e66cd00..c94cfed 100644
+--- a/include/IList.h
++++ b/include/IList.h
+@@ -26,7 +26,9 @@ public:
+   void swap(IList<T> &list) { IListBase::swap(list); }
+   T *head() const { return (T *)IListBase::head(); }
+   T *get() { return (T *)IListBase::get(); }
++  using
+   IListBase::clear;
++  using
+   IListBase::empty;
+ friend class IListIter<T>;
+ private:
+diff --git a/include/IListIter.h b/include/IListIter.h
+index 74e1bd6..d322bf8 100644
+--- a/include/IListIter.h
++++ b/include/IListIter.h
+@@ -17,7 +17,9 @@ public:
+   IListIter(const IList<T> &list) : IListIterBase(list) { }
+   T *cur() const { return (T *)IListIterBase::cur(); }
+
++  using
+   IListIterBase::next;
++  using
+   IListIterBase::done;
+ };
+
+diff --git a/include/Ptr.h b/include/Ptr.h
+index c6b2767..5dda0ca 100644
+--- a/include/Ptr.h
++++ b/include/Ptr.h
+@@ -69,7 +69,9 @@ public:
+   const T *operator->() const { return Ptr<T>::pointer(); }
+   const T &operator*() const { return *Ptr<T>::pointer(); }
+   void swap(ConstPtr<T> &p) { Ptr<T>::swap(p); }
++  using
+   Ptr<T>::isNull;
++  using
+   Ptr<T>::clear;
+   Boolean operator==(const Ptr<T> &p) const { return Ptr<T>::operator==(p); }
+   Boolean operator!=(const Ptr<T> &p) const { return Ptr<T>::operator!=(p); }
+diff --git a/lib/Parser.h b/lib/Parser.h
+index e721000..c6c41b2 100644
+--- a/lib/Parser.h
++++ b/lib/Parser.h
+@@ -62,15 +62,25 @@ public:
+   Parser(const SgmlParser::Params &);
+   Event *nextEvent();
+   void parseAll(EventHandler &, const volatile sig_atomic_t *cancelPtr);
++  using
+   ParserState::sdPointer;
++  using
+   ParserState::instanceSyntaxPointer;
++  using
+   ParserState::prologSyntaxPointer;
++  using
+   ParserState::activateLinkType;
++  using
+   ParserState::allLinkTypesActivated;
++  using
+   ParserState::entityManager;
++  using
+   ParserState::entityCatalog;
++  using
+   ParserState::baseDtd;
++  using
+   ParserState::options;
++  using 
+   ParserState::instantiateDtd;
+   friend class PiAttspecParser;
+ private:
diff --git a/ports/libopensp/vcpkg.json b/ports/libopensp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libopensp",
   "version": "1.5.2",
-  "port-version": 2,
+  "port-version": 3,
   "description": "SGML parser algorithm",
   "homepage": "http://openjade.sourceforge.net",
   "license": "MIT",

diff --git a/ports/openturns/portfile.cmake b/ports/openturns/portfile.cmake
@@ -11,10 +11,10 @@ vcpkg_from_github(
 
 vcpkg_find_acquire_program(FLEX)
 get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY)
-vcpkg_add_to_path("${FLEX_DIR}")
+vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
 vcpkg_find_acquire_program(BISON)
 get_filename_component(BISON_DIR "${BISON}" DIRECTORY)
-vcpkg_add_to_path("${BISON_DIR}")
+vcpkg_add_to_path(PREPEND "${BISON_DIR}")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"

diff --git a/ports/openturns/vcpkg.json b/ports/openturns/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "openturns",
   "version": "1.20",
+  "port-version": 1,
   "description": "OpenTURNS is a scientific C++ and Python library featuring an internal data model and algorithms dedicated to the treatment of uncertainties.",
   "homepage": "http://www.openturns.org",
   "license": null,

diff --git a/ports/zydis/portfile.cmake b/ports/zydis/portfile.cmake
@@ -1,3 +1,10 @@
+vcpkg_download_distfile(
+    OSX_INTEL_ALIGNMENT_FIX
+    URLS https://github.com/zyantific/zydis/commit/a605f54580c26d2164530fab323057834569d169.patch?full_index=1
+    SHA512 15fad10e4880ab2ee494babc0451b96604a6cc00c09c6740c6b97b83718e01d8e117614bf8f9ec8a6777e9baa1336c7f540709b21dcdc9b53f912bd117f1d3c0
+    FILENAME zydis-intel-alignment-fix-a605f54580c26d2164530fab323057834569d169.patch
+)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zyantific/zydis
@@ -6,6 +13,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         zycore.patch
+        "${OSX_INTEL_ALIGNMENT_FIX}"
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZYDIS_BUILD_SHARED_LIB)

diff --git a/ports/zydis/vcpkg.json b/ports/zydis/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "zydis",
   "version-semver": "4.0.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Fast and lightweight x86/x86-64 disassembler library.",
   "homepage": "https://zydis.re",
   "license": "MIT",

diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
@@ -5,7 +5,8 @@ variables:
   android-pool: 'PrAnd-1ES-Pool'
   linux-pool: 'PrLin-1ES-Pool'
   windows-pool: 'PrWin-2024-01-11'
-  osx-pool: 'PrOsx-2023-09-11'
+  osx-pool: 'PrOsx-2024-01-18'
+  osx-arm64-pool: 'PrOsx-2024-01-22-arm64'
   linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2024-01-11'
 
 parameters:
@@ -77,10 +78,20 @@ jobs:
 
 - template: osx/azure-pipelines.yml
   parameters:
+    triplet: x64-osx
+    jobName: x64_osx
     poolName: $(osx-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
+- template: osx/azure-pipelines.yml
+  parameters:
+    triplet: arm64-osx
+    jobName: arm64_osx
+    poolName: $(osx-arm64-pool)
+    vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
+    tripletPattern: ${{ parameters.tripletPattern }}
+
 - template: linux/azure-pipelines.yml
   parameters:
     poolName: $(linux-pool)