[cmake/getdns/jasper/mesa/sentry-native] Fix error C2065 and C2079 (#22630)

* [cmake/getdns/jasper/mesa/sentry-native] Fix error C2065 and C2079 * Add windows check * Add MINGW check * update json Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
2024-12-27 18:31:15 +08:00 · 2022-01-25 04:21:52 +08:00 · 2022-01-25 04:21:52 +08:00 · 48b4cb1cce
commit 48b4cb1cce
parent 3afbc7b286
15 changed files with 57 additions and 14 deletions
--- a/ports/getdns/portfile.cmake
+++ b/ports/getdns/portfile.cmake
@ -16,6 +16,11 @@ vcpkg_extract_source_archive(
    PATCHES disable-install-COPYING-in-config-step.patch
 )

+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}")
+    set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}")
+endif()
+
 vcpkg_check_features(
    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
    FEATURES
--- a/ports/getdns/vcpkg.json
+++ b/ports/getdns/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "getdns",
  "version": "1.7.0",
-  "port-version": 1,
+  "port-version": 2,
  "description": "GetDNS is a modern asynchronous DNS API",
  "homepage": "https://getdnsapi.net/",
  "supports": "!uwp",
--- a/ports/jasper/portfile.cmake
+++ b/ports/jasper/portfile.cmake
@ -6,6 +6,11 @@ vcpkg_from_github(
    HEAD_REF master
 )

+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}")
+    set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}")
+endif()
+
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JAS_ENABLE_SHARED)

 vcpkg_cmake_configure(
--- a/ports/jasper/vcpkg.json
+++ b/ports/jasper/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "jasper",
  "version": "2.0.33",
+  "port-version": 1,
  "description": "Open source implementation of the JPEG-2000 Part-1 standard",
  "homepage": "https://github.com/mdadams/jasper",
  "dependencies": [
--- a/ports/mesa/portfile.cmake
+++ b/ports/mesa/portfile.cmake
@ -170,8 +170,12 @@ list(APPEND MESA_OPTIONS -Dshared-glapi=enabled)  #shared GLAPI required when bu
 if(VCPKG_TARGET_IS_WINDOWS)
    list(APPEND MESA_OPTIONS -Dplatforms=['windows'])
    list(APPEND MESA_OPTIONS -Dmicrosoft-clc=disabled)
+    if(NOT VCPKG_TARGET_IS_MINGW)
+        set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}")
+        set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}")
+    endif()
 endif()
-
+
 vcpkg_configure_meson(
    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS 
--- a/ports/mesa/vcpkg.json
+++ b/ports/mesa/vcpkg.json
@ -1,7 +1,7 @@
 {
  "name": "mesa",
  "version": "21.2.5",
-  "port-version": 1,
+  "port-version": 2,
  "description": "Mesa - The 3D Graphics Library",
  "homepage": "https://www.mesa3d.org/",
  "supports": "!(windows & arm)",
--- a/ports/sentry-native/portfile.cmake
+++ b/ports/sentry-native/portfile.cmake
@ -1,7 +1,3 @@
-if(NOT VCPKG_TARGET_IS_OSX)
-    vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP")
-endif()
-
 vcpkg_download_distfile(ARCHIVE
    URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.13/sentry-native.zip"
    FILENAME "sentry-native-0.4.13.zip"
@ -30,8 +26,13 @@ if (NOT DEFINED SENTRY_BACKEND)
    endif()
 endif()

+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}")
+    set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}")
+endif()
+
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
        -DSENTRY_BUILD_TESTS=OFF
        -DSENTRY_BUILD_EXAMPLES=OFF
@ -59,7 +60,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()

 file(
-    INSTALL ${SOURCE_PATH}/LICENSE
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
+    INSTALL "${SOURCE_PATH}/LICENSE"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
    RENAME copyright
 )
--- a/ports/sentry-native/vcpkg.json
+++ b/ports/sentry-native/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "sentry-native",
  "version-semver": "0.4.13",
+  "port-version": 1,
  "description": "Sentry SDK for C, C++ and native applications.",
  "homepage": "https://sentry.io/",
  "supports": "!(arm | (arm64 & !osx) | uwp)",
--- a/scripts/test_ports/cmake/portfile.cmake
+++ b/scripts/test_ports/cmake/portfile.cmake
@ -25,6 +25,11 @@ if(VCPKG_CROSSCOMPILING)
    endif()
 endif()

+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    set(VCPKG_CXX_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_CXX_FLAGS}")
+    set(VCPKG_C_FLAGS "/D_CRT_DECLARE_NONSTDC_NAMES ${VCPKG_C_FLAGS}")
+endif()
+
 vcpkg_configure_cmake(
    SOURCE_PATH ${SOURCE_PATH}
    PREFER_NINJA
--- a/scripts/test_ports/cmake/vcpkg.json
+++ b/scripts/test_ports/cmake/vcpkg.json
@ -1,6 +1,7 @@
 {
  "name": "cmake",
  "version-string": "3.20.0",
+  "port-version": 1,
  "description": "CMake is an open-source, cross-platform family of tools designed to build, test and package software.",
  "homepage": "https://cmake.org/",
  "dependencies": [
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -2418,7 +2418,7 @@
    },
    "getdns": {
      "baseline": "1.7.0",
-      "port-version": 1
+      "port-version": 2
    },
    "getopt": {
      "baseline": "0",
@ -2954,7 +2954,7 @@
    },
    "jasper": {
      "baseline": "2.0.33",
-      "port-version": 0
+      "port-version": 1
    },
    "jbig2dec": {
      "baseline": "0.19",
@ -4362,7 +4362,7 @@
    },
    "mesa": {
      "baseline": "21.2.5",
-      "port-version": 1
+      "port-version": 2
    },
    "meschach": {
      "baseline": "1.2b",
@ -6302,7 +6302,7 @@
    },
    "sentry-native": {
      "baseline": "0.4.13",
-      "port-version": 0
+      "port-version": 1
    },
    "septag-sx": {
      "baseline": "2019-05-07",
--- a/versions/g-/getdns.json
+++ b/versions/g-/getdns.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "877301bc39a398579f0f3f13725afcd4bcd797c4",
+      "version": "1.7.0",
+      "port-version": 2
+    },
    {
      "git-tree": "3fc05946f698399983a44d1c9a173df743c7bacf",
      "version": "1.7.0",
--- a/versions/j-/jasper.json
+++ b/versions/j-/jasper.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "6fc7475e9c22dafb473c98e00136e89c03ad8f5b",
+      "version": "2.0.33",
+      "port-version": 1
+    },
    {
      "git-tree": "c00bfcf7f17b8ba6db6ee5e62ac379902bbba96f",
      "version": "2.0.33",
--- a/versions/m-/mesa.json
+++ b/versions/m-/mesa.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "60ae9e5d7081930a0e736be1742db18b01a0114b",
+      "version": "21.2.5",
+      "port-version": 2
+    },
    {
      "git-tree": "9318298d8532439ec65868f7b1997f2b8d49fec5",
      "version": "21.2.5",
--- a/versions/s-/sentry-native.json
+++ b/versions/s-/sentry-native.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "9fb136cdde824d2f306a1afbd99830af76446158",
+      "version-semver": "0.4.13",
+      "port-version": 1
+    },
    {
      "git-tree": "d0ab3adf0fe8f521553af8345c6c11e6e883f065",
      "version-semver": "0.4.13",