From a4d42aac246ded930e014c95608ec582959c165d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 18 Jun 2020 02:19:55 +0800 Subject: [PATCH] [breakpad] Fix build failure on OSX (#11984) * [breakpad] Fix build failure on OSX * update baseline * Update portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/breakpad/CMakeLists.txt | 7 ++++--- ports/breakpad/CONTROL | 2 +- ports/breakpad/portfile.cmake | 10 ++++------ scripts/ci.baseline.txt | 1 - 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ports/breakpad/CMakeLists.txt b/ports/breakpad/CMakeLists.txt index 01c949251e..113002943f 100644 --- a/ports/breakpad/CMakeLists.txt +++ b/ports/breakpad/CMakeLists.txt @@ -77,15 +77,16 @@ if(INSTALL_HEADERS) if(WIN32) set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests") elseif(APPLE) - set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/windows|/solaris|/android|/dwarf|/tests|/testdata|/unittests") + set(HEADER_EXCLUDE_REGEX "/apple|/ios|/linux|/windows|/solaris|/android|/dwarf|/tests|/testdata|/unittests|/*proj|/gcov") else() set(HEADER_EXCLUDE_REGEX "/apple|/ios|/client/linux/data|/client/linux/sender|/windows|/mac|/solaris|/android|/dwarf|/tests|/testdata|/unittests") endif() install( DIRECTORY src/client src/common src/google_breakpad DESTINATION include/ - FILES_MATCHING PATTERN "*.h" - REGEX "${HEADER_EXCLUDE_REGEX}" EXCLUDE + FILES_MATCHING + PATTERN "*.h" + REGEX ${HEADER_EXCLUDE_REGEX} EXCLUDE ) endif() diff --git a/ports/breakpad/CONTROL b/ports/breakpad/CONTROL index b701aa69f6..a50eab6979 100644 --- a/ports/breakpad/CONTROL +++ b/ports/breakpad/CONTROL @@ -1,5 +1,5 @@ Source: breakpad -Version: 2019-07-11-1 +Version: 2019-07-11-2 Build-Depends: libdisasm Homepage: https://github.com/google/breakpad Description: a set of client and server components which implement a crash-reporting system. diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake index a5c3022f93..29f027e401 100644 --- a/ports/breakpad/portfile.cmake +++ b/ports/breakpad/portfile.cmake @@ -1,15 +1,13 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/breakpad - REF c46151db0ffd1a8dae914e45f1212ef427f61ed3 + REF c46151db0ffd1a8dae914e45f1212ef427f61ed3 SHA512 bd9f247851a3caa6f36574c8a243c2a01cb1cf23c2266b6f6786b85c7418dba5937363c00184e26cda24225f96bb7aaeb08efd13d6a269a3b78c357c2eda7e14 HEAD_REF master - PATCHES - fix-unique_ptr.patch + PATCHES + fix-unique_ptr.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -25,4 +23,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-breakpad TARGET_PATH shar vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/breakpad RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index edc4e9b48c..bd27e5d5ba 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -173,7 +173,6 @@ botan:x64-uwp=fail box2d:x64-uwp=fail box2d:arm-uwp=fail breakpad:arm64-windows=fail -breakpad:x64-osx=fail bullet3:arm64-windows=fail bullet3:arm-uwp=fail bullet3:x64-uwp=fail