diff --git a/ports/cpuinfo/check-for-x86-correctly.patch b/ports/cpuinfo/check-for-x86-correctly.patch deleted file mode 100644 index 7acb388cdf..0000000000 --- a/ports/cpuinfo/check-for-x86-correctly.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 99486c3d72cc0aec72992eb95bd46a27f09ff41e Mon Sep 17 00:00:00 2001 -From: Billy Robert O'Neal III -Date: Wed, 15 Jun 2022 13:59:23 -0700 -Subject: [PATCH] Always check for x86-ish with the same regex. - -On line 68, and in most places, "intel-like" is checked with `i[3-6]86|AMD64|x86(_64)?`, but in these 3 places the (_x64)? was missing. - -First reported as https://github.com/microsoft/vcpkg/issues/24713 ---- - CMakeLists.txt | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 74364e8..1cdada0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -319,7 +319,7 @@ ENDIF() - # ---[ cpuinfo mock library and mock tests - IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_MOCK_TESTS) - SET(CPUINFO_MOCK_SRCS "${CPUINFO_SRCS}") -- IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86_64)$") -+ IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?)$") - LIST(APPEND CPUINFO_MOCK_SRCS src/x86/mockcpuid.c) - ENDIF() - IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android") -@@ -763,7 +763,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_UNIT_TESTS) - ADD_TEST(get-current-test get-current-test) - ENDIF() - -- IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86_64)$") -+ IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?)$") - ADD_EXECUTABLE(brand-string-test test/name/brand-string.cc) - CPUINFO_TARGET_ENABLE_CXX11(brand-string-test) - CPUINFO_TARGET_RUNTIME_LIBRARY(brand-string-test) -@@ -830,7 +830,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_TOOLS) - CPUINFO_TARGET_RUNTIME_LIBRARY(cpuinfo-dump) - ENDIF() - -- IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86_64)$") -+ IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?)$") - ADD_EXECUTABLE(cpuid-dump tools/cpuid-dump.c) - CPUINFO_TARGET_ENABLE_C99(cpuid-dump) - CPUINFO_TARGET_RUNTIME_LIBRARY(cpuid-dump) -@@ -869,4 +869,3 @@ IF(CPUINFO_BUILD_PKG_CONFIG) - DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - - ENDIF() -- diff --git a/ports/cpuinfo/portfile.cmake b/ports/cpuinfo/portfile.cmake index d992673358..0065691ade 100644 --- a/ports/cpuinfo/portfile.cmake +++ b/ports/cpuinfo/portfile.cmake @@ -6,11 +6,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pytorch/cpuinfo - REF b40bae27785787b6dd70788986fd96434cf90ae2 - SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c + REF 5e63739504f0f8e18e941bd63b2d6d42536c7d90 + SHA512 6a61f4574661a55771c2ec31bb0919a51d0bd8c770477b254a5c14dc5323716af275c7fe3abc5aa96720d7cc929559ca66f614265d3940e076b8db2fa15c8e36 HEAD_REF master - PATCHES - check-for-x86-correctly.patch # https://github.com/pytorch/cpuinfo/pull/93 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/cpuinfo/vcpkg.json b/ports/cpuinfo/vcpkg.json index cc1c3159cb..d2087dfbc5 100644 --- a/ports/cpuinfo/vcpkg.json +++ b/ports/cpuinfo/vcpkg.json @@ -1,11 +1,10 @@ { "name": "cpuinfo", - "version-date": "2022-04-02", - "port-version": 1, + "version-date": "2022-07-19", "description": "CPU INFOrmation library (x86/x86-64/ARM/ARM64, Linux/Windows/Android/macOS/iOS)", "homepage": "https://github.com/pytorch/cpuinfo", "license": "BSD-2-Clause", - "supports": "!(arm & windows)", + "supports": "!(uwp & arm32)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index c4885d296e..43b3a9e098 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1693,8 +1693,8 @@ "port-version": 3 }, "cpuinfo": { - "baseline": "2022-04-02", - "port-version": 1 + "baseline": "2022-07-19", + "port-version": 0 }, "cr": { "baseline": "2020-04-26", diff --git a/versions/c-/cpuinfo.json b/versions/c-/cpuinfo.json index 485dd2a03d..0215d34e3c 100644 --- a/versions/c-/cpuinfo.json +++ b/versions/c-/cpuinfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ee1eff9fe6cfa584b697e71ce7081a69ef2c51d", + "version-date": "2022-07-19", + "port-version": 0 + }, { "git-tree": "11ac581a5c1307b2039cf9db3933c2aeffb7a923", "version-date": "2022-04-02",