From faf9a0844dca566cc2a69f802c01e0919701f92d Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 27 Jul 2021 18:43:26 -0700 Subject: [PATCH 1/3] [pistache] Delete the port. The port "pistache" was only installing its verdored copy of rapidjson, it wasn't actually installing anything related to itself. As a result, if rapidjson was already installed by vcpkg, and the port tried to use the one provided by vcpkg, nothing at all would be installed. There is no evidence that anyone actually used this port. The upstream project does not have proper cmake bindings set up, and it will require substantial modification of their build system to repair. As a result, this change just deletes the port. It is likely that someone could add it back later in terms of meson, which seems to be the buildsystem preferred upstream. --- ports/pistache/disable-warnings.patch | 12 --------- ports/pistache/fix-debug-empty.patch | 36 --------------------------- ports/pistache/portfile.cmake | 30 ---------------------- ports/pistache/vcpkg.json | 8 ------ 4 files changed, 86 deletions(-) delete mode 100644 ports/pistache/disable-warnings.patch delete mode 100644 ports/pistache/fix-debug-empty.patch delete mode 100644 ports/pistache/portfile.cmake delete mode 100644 ports/pistache/vcpkg.json diff --git a/ports/pistache/disable-warnings.patch b/ports/pistache/disable-warnings.patch deleted file mode 100644 index 717937ff8bd980..00000000000000 --- a/ports/pistache/disable-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e051efa..9d65174 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,7 +13,6 @@ project (pistache - - include(GNUInstallDirs) - --add_compile_options(-Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) - - include(CheckAtomic) diff --git a/ports/pistache/fix-debug-empty.patch b/ports/pistache/fix-debug-empty.patch deleted file mode 100644 index f6a7b97a0cbd8d..00000000000000 --- a/ports/pistache/fix-debug-empty.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9aeed1e..7316732 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -48,12 +48,12 @@ if (BUILD_SHARED_LIBS) - add_library(pistache_shared SHARED $) - target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) - target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) --endif () -+else () - - add_library(pistache_static STATIC $) - target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) - target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) -- -+endif() - if (PISTACHE_USE_SSL) - target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) - target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) -@@ -72,8 +72,15 @@ if (BUILD_SHARED_LIBS) - OUTPUT_NAME ${Pistache_OUTPUT_NAME}-${VERSION} - SOVERSION ${SONAME_VERSION_MAJOR}.${SONAME_VERSION_MINOR} - ) --endif () -+else () - - set_target_properties(pistache_static PROPERTIES - OUTPUT_NAME ${Pistache_OUTPUT_NAME} - ) -+endif() -+install( -+ TARGETS pistache -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+) diff --git a/ports/pistache/portfile.cmake b/ports/pistache/portfile.cmake deleted file mode 100644 index 9c50d2f00d60be..00000000000000 --- a/ports/pistache/portfile.cmake +++ /dev/null @@ -1,30 +0,0 @@ -if(NOT VCPKG_TARGET_IS_LINUX) - message(FATAL_ERROR "${PORT} currently only supports Linux platform.") -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO pistacheio/pistache - REF 9dc080b9ebbe6fc1726b45e9db1550305938313e #2021-03-31 - SHA512 b55c395fb98af85317590ed2502564af5e92e30a35618132568c6ab589a6d0971570ad20ddbd1f49d9dd8cf54692866c69cfc1350c6fdccf9efb039aacf153b4 - HEAD_REF master - PATCHES - fix-debug-empty.patch - disable-warnings.patch -) - -vcpkg_configure_cmake( - SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA -) - -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/RapidJSON) -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pistache/vcpkg.json b/ports/pistache/vcpkg.json deleted file mode 100644 index 0cac84c446f3ea..00000000000000 --- a/ports/pistache/vcpkg.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "pistache", - "version-date": "2021-03-31", - "port-version": 1, - "description": "Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure-C++11 and provides a clear and pleasant API", - "homepage": "https://github.com/oktal/pistache", - "supports": "linux" -} From 7b673157389ec8cd7cc07d2cb68229f3459afb68 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Tue, 27 Jul 2021 18:46:09 -0700 Subject: [PATCH 2/3] Delete baseline.json entry. --- versions/baseline.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 2b77f92ecbdb86..904805bc62e92c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4888,10 +4888,6 @@ "baseline": "2019-07-11", "port-version": 0 }, - "pistache": { - "baseline": "2021-03-31", - "port-version": 1 - }, "pixel": { "baseline": "0.3-1", "port-version": 0 From 3334edab53a201aa41614e075acb8a504f79a186 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Wed, 28 Jul 2021 09:22:58 -0700 Subject: [PATCH 3/3] remove pistache from ci.baseline.txt --- scripts/ci.baseline.txt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9fd0dd71c12db3..fc573d8a379968 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1214,14 +1214,6 @@ pfring:x64-osx=fail pfring:x64-linux=fail physx:arm64-windows=fail piex:x64-osx=fail -pistache:arm64-windows=fail -pistache:arm-uwp=fail -pistache:x64-osx=fail -pistache:x64-uwp=fail -pistache:x64-windows=fail -pistache:x64-windows-static=fail -pistache:x64-windows-static-md=fail -pistache:x86-windows=fail pixel:x64-uwp=fail pixel:x64-windows=fail pixel:x64-windows-static=fail