diff --git a/ports/crashpad/crashpadConfig.cmake.in b/ports/crashpad/crashpadConfig.cmake.in index 1c95bf1b77..4bb7434d13 100644 --- a/ports/crashpad/crashpadConfig.cmake.in +++ b/ports/crashpad/crashpadConfig.cmake.in @@ -15,7 +15,7 @@ if(WIN32) target_compile_definitions(crashpad INTERFACE NOMINMAX) elseif(APPLE) list(APPEND CRASHPAD_LIBRARIES ApplicationServices - CoreFoundation Foundation IOKit Security bsm) + CoreFoundation Foundation IOKit Security bsm mig_output) endif() foreach(LIB_NAME ${CRASHPAD_LIBRARIES}) diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake index 62b1eddd83..9df18b7ac5 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://chromium.googlesource.com/crashpad/crashpad - REF 68aba08c48bb428b7b159b3371163f86e8d5a126 + REF 261679b3d2f3336d8531ed38e110254c3e2d1c10 ) vcpkg_find_acquire_program(PYTHON3) @@ -113,6 +113,10 @@ install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") +if(VCPKG_TARGET_IS_OSX) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +endif() # remove empty directories file(REMOVE_RECURSE diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index bc02923447..e57a5f6b51 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,7 +1,6 @@ { "name": "crashpad", - "version-date": "2022-04-16", - "port-version": 3, + "version-date": "2022-09-05", "description": [ "Crashpad is a crash-reporting system.", "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss." diff --git a/versions/baseline.json b/versions/baseline.json index ac7f024c28..91f4af36ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1705,8 +1705,8 @@ "port-version": 1 }, "crashpad": { - "baseline": "2022-04-16", - "port-version": 3 + "baseline": "2022-09-05", + "port-version": 0 }, "crashrpt": { "baseline": "1.4.3", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index 2d7b0a2fd5..ac717ea892 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d39be1cd402a6147c057802a84ffdc1715d6384", + "version-date": "2022-09-05", + "port-version": 0 + }, { "git-tree": "e1338388a039df55d6812726dd2e638684a19509", "version-date": "2022-04-16",