From 03b5c9894de7693911454cdfdf990f93c8215fac Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 19 Dec 2022 20:28:44 +0100 Subject: [PATCH] [cpuinfo] fix arm64-osx build (#28409) --- ports/cpuinfo/portfile.cmake | 6 +++++- ports/cpuinfo/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cpuinfo.json | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/cpuinfo/portfile.cmake b/ports/cpuinfo/portfile.cmake index 0065691ade..a555aa983f 100644 --- a/ports/cpuinfo/portfile.cmake +++ b/ports/cpuinfo/portfile.cmake @@ -50,8 +50,12 @@ vcpkg_fixup_pkgconfig() # pkg_check_modules(libcpuinfo) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if("tools" IN_LIST FEATURES) + set(additional_tools "") + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/cpuid-dump") + list(APPEND additional_tools "cpuid-dump") + endif() vcpkg_copy_tools( - TOOL_NAMES cache-info cpuid-dump cpu-info isa-info + TOOL_NAMES cache-info cpu-info isa-info ${additional_tools} AUTO_CLEAN ) endif() diff --git a/ports/cpuinfo/vcpkg.json b/ports/cpuinfo/vcpkg.json index d2087dfbc5..d100d86538 100644 --- a/ports/cpuinfo/vcpkg.json +++ b/ports/cpuinfo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpuinfo", "version-date": "2022-07-19", + "port-version": 1, "description": "CPU INFOrmation library (x86/x86-64/ARM/ARM64, Linux/Windows/Android/macOS/iOS)", "homepage": "https://github.com/pytorch/cpuinfo", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 75c635b32e..ddf128c9c3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1726,7 +1726,7 @@ }, "cpuinfo": { "baseline": "2022-07-19", - "port-version": 0 + "port-version": 1 }, "cr": { "baseline": "2020-04-26", diff --git a/versions/c-/cpuinfo.json b/versions/c-/cpuinfo.json index 0215d34e3c..7ede377db5 100644 --- a/versions/c-/cpuinfo.json +++ b/versions/c-/cpuinfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd82cda8111eabcbc6317c215c4ad58b9778e7e0", + "version-date": "2022-07-19", + "port-version": 1 + }, { "git-tree": "5ee1eff9fe6cfa584b697e71ce7081a69ef2c51d", "version-date": "2022-07-19",