diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-10-24 22:36:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-24 22:36:53 -0700 |
| commit | b97849d25804ca06125f6d311c7139df1339b84c (patch) | |
| tree | 11c0fca83f90f035d2a348ef3ca04857712f1fa0 /ports/libp7-baical | |
| parent | 2f731d650f4b5810fede35adda304807daa034df (diff) | |
| download | vcpkg-b97849d25804ca06125f6d311c7139df1339b84c.tar.gz vcpkg-b97849d25804ca06125f6d311c7139df1339b84c.zip | |
[Many Ports] Baseline Fixes for 2020-10-24 CI Build (#14208)
* [libp7client, libp7-baical] Combine identical ports and update to libp7client 5.6.
In a recent CI build, we started getting output like:
Installing package libp7-baical[core]:x86-windows...
The following files are already installed in C:/Dev/vcpkg/installed/x86-windows and are in conflict with libp7-baical:x86-windows
Installed by libp7client:x86-windows
bin/P7x32.dll
bin/P7x32.pdb
debug/bin/P7x32d.dll
debug/bin/P7x32d.pdb
include/P7/GTypes.h
include/P7/P7_Client.h
include/P7/P7_Cproxy.h
include/P7/P7_Extensions.h
include/P7/P7_Telemetry.h
include/P7/P7_Trace.h
It turns out that these ports are identical, they are just different versions of the same library. The libp7-baical version supported more platforms and was simpler, so took that one and updated it to a current version.
* [ignition-modularscripts, ignition-msgs1] Attempt to fix intermittent build failures by disabling parallel configure.
* Fix several "passing: remove from fail list."
* [akali] Disable parallel configure.
REGRESSION: akali:x64-windows. If expected, add akali:x64-windows=fail to .\scripts\ci.baseline.txt.
Attempts to fix:
CMake Error: Could not open file for write in copy operation C:/Dev/vcpkg/buildtrees/akali/src/fc94eb83a9-01654d3f7c.clean/include/akali_config.h.tmp
CMake Error: : System Error: Permission denied
CMake Error at CMakeLists.txt:20 (configure_file):
configure_file Problem configuring file
* [nvtt] Devendor libsquish
This was regressed by https://github.com/microsoft/vcpkg/pull/13674
REGRESSION: nvtt:x64-linux. If expected, add nvtt:x64-linux=fail to .\scripts\ci.baseline.txt.
REGRESSION: nvtt:x64-osx. If expected, add nvtt:x64-osx=fail to .\scripts\ci.baseline.txt.
REGRESSION: nvtt:x64-windows-static. If expected, add nvtt:x64-windows-static=fail to .\scripts\ci.baseline.txt.
REGRESSION: nvtt:x64-windows. If expected, add nvtt:x64-windows=fail to .\scripts\ci.baseline.txt.
Installing package nvtt[core]:x64-linux...
The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with nvtt:x64-linux
Installed by libsquish:x64-linux
debug/lib/libsquishd.a
include/squish.h
lib/libsquish.a
* [knet] Disable parallel configure.
REGRESSION: knet:x64-windows. If expected, add knet:x64-windows=fail to .\scripts\ci.baseline.txt.
CMake Error at src/CMakeLists.txt:1 (configure_file):
configure_file Problem configuring file
* [libnice] Diable parallel configure.
REGRESSION: libnice:x64-windows. If expected, add libnice:x64-windows=fail to .\scripts\ci.baseline.txt.
CMake Error at CMakeLists.txt:13 (configure_file):
configure_file Problem configuring file
Diffstat (limited to 'ports/libp7-baical')
| -rw-r--r-- | ports/libp7-baical/CMakeLists.txt | 53 | ||||
| -rw-r--r-- | ports/libp7-baical/CONTROL | 8 | ||||
| -rw-r--r-- | ports/libp7-baical/portfile.cmake | 32 |
3 files changed, 5 insertions, 88 deletions
diff --git a/ports/libp7-baical/CMakeLists.txt b/ports/libp7-baical/CMakeLists.txt deleted file mode 100644 index 6b1044e43..000000000 --- a/ports/libp7-baical/CMakeLists.txt +++ /dev/null @@ -1,53 +0,0 @@ -project(P7) -cmake_minimum_required(VERSION 3.0) - -set(SOURCES "Sources/ClBaical.cpp" - "Sources/ClFile.cpp" - "Sources/Client.cpp" - "Sources/ClNull.cpp" - "Sources/ClText.cpp" - "Sources/CRC32.cpp" - "Sources/Proxy.cpp" - "Sources/Telemetry.cpp" - "Sources/Trace.cpp" -) - -if(WIN32) - set(RESOURCES "Sources/P7Client.rc") -else() - set(RESOURCES "") -endif() - -add_library(P7 "${SOURCES}" "${RESOURCES}") -target_include_directories(P7 PRIVATE "Headers/") -target_include_directories(P7 PRIVATE "Shared/") -if(WIN32) - target_include_directories(P7 PRIVATE "Shared/Platforms/Windows_x86/") - target_link_libraries(P7 "ws2_32") -else() - target_include_directories(P7 PRIVATE "Shared/Platforms/Linux_x86/") -endif() - -if(WIN32) - set_target_properties(P7 PROPERTIES PREFIX "") - if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "x64d") - set_target_properties(P7 PROPERTIES RELEASE_POSTFIX "x64") - else() - set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "x32d") - set_target_properties(P7 PROPERTIES RELEASE_POSTFIX "x32") - endif() -else() - set_target_properties(P7 PROPERTIES PREFIX "lib") - set_target_properties(P7 PROPERTIES POSTFIX "") - set_target_properties(P7 PROPERTIES DEBUG_POSTFIX "d") -endif() - -install(TARGETS P7 - RUNTIME DESTINATION "bin" - ARCHIVE DESTINATION "lib" - LIBRARY DESTINATION "lib") - -install(DIRECTORY Headers/ - DESTINATION include/P7 - FILES_MATCHING PATTERN "*.h") diff --git a/ports/libp7-baical/CONTROL b/ports/libp7-baical/CONTROL index 179d6d825..d23258e03 100644 --- a/ports/libp7-baical/CONTROL +++ b/ports/libp7-baical/CONTROL @@ -1,6 +1,4 @@ Source: libp7-baical -Version: 4.4 -Port-Version: 5 -Homepage: https://baical.net/ -Description: P7 is a library for high-speed sending telemetry & trace data from application -Supports: !(arm|uwp|osx)
\ No newline at end of file +Version: replaced +Build-Depends: libp7client +Description: An old name for the port libp7client; please install libp7client instead. diff --git a/ports/libp7-baical/portfile.cmake b/ports/libp7-baical/portfile.cmake index d6fc5f9de..6320a2825 100644 --- a/ports/libp7-baical/portfile.cmake +++ b/ports/libp7-baical/portfile.cmake @@ -1,30 +1,2 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx") - -set(LIBP7_VERSION 4.4) -set(LIBP7_HASH 500fefdf6fb01999ddb2accc8309cf8749fb7a65abb98faaf6d71a5ae3da4eac8c00c083905b01f7f6cc973387b605f2c4db0bb007562f76b7ad43b6abe2b91f) - -vcpkg_download_distfile(ARCHIVE - URLS "http://baical.net/files/libP7_v${LIBP7_VERSION}.zip" - FILENAME "libP7_v${LIBP7_VERSION}.zip" - SHA512 ${LIBP7_HASH} -) - -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - NO_REMOVE_ONE_LEVEL -) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) - -vcpkg_install_cmake() -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +message(WARNING "libp7-baical has been replaced by libp7client.") |
