From f95b78e0043eb80840670d0cfc7912263193654e Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Thu, 14 Apr 2022 11:25:29 -0400 Subject: [PATCH] [qpid-proton] Stop using linker optimization (#24129) * Stop using linker optimization These optimizations require the gold linker on Linux, and this linker is not typically available. * Add license * Fix formatting --- ports/qpid-proton/portfile.cmake | 7 ++++--- ports/qpid-proton/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/q-/qpid-proton.json | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 4df813a93a..7737f51118 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -15,11 +15,12 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPYTHON_EXECUTABLE=${PYTHON3} - -DLIB_SUFFIX= -DBUILD_GO=no - -DENABLE_JSONCPP=ON -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON + -DENABLE_JSONCPP=ON + -DENABLE_LINKTIME_OPTIMIZATION=OFF + -DLIB_SUFFIX= + -DPYTHON_EXECUTABLE=${PYTHON3} ) vcpkg_cmake_install() diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json index 3dd0dcff04..5ff4eabf32 100644 --- a/ports/qpid-proton/vcpkg.json +++ b/ports/qpid-proton/vcpkg.json @@ -1,9 +1,10 @@ { "name": "qpid-proton", "version": "0.32.0", - "port-version": 4, + "port-version": 5, "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", + "license": "Apache-2.0", "dependencies": [ "jsoncpp", { diff --git a/versions/baseline.json b/versions/baseline.json index 6c4355e81d..8d3a9a8efd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5646,7 +5646,7 @@ }, "qpid-proton": { "baseline": "0.32.0", - "port-version": 4 + "port-version": 5 }, "qscintilla": { "baseline": "2.12.0", diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json index f96fe69841..d4e5f16a97 100644 --- a/versions/q-/qpid-proton.json +++ b/versions/q-/qpid-proton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc437ca04548b4ca544af845a2e2327010aa3281", + "version": "0.32.0", + "port-version": 5 + }, { "git-tree": "be327f08d64834a36d80a140832abbbc66e67207", "version": "0.32.0",