diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch deleted file mode 100644 index a881c83495..0000000000 --- a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2a0dd2b300242230faa92cf8e26ccd70231bc9ef Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 19 Mar 2022 23:37:58 -0700 -Subject: [PATCH] cmake: Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_BINDIR - -This ensures the install paths are not hardcoded. - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending ---- - cmake/CMakeLists.txt | 4 ++-- - src/samples/CMakeLists.txt | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -34,7 +34,7 @@ export(EXPORT ${package_name} - ) - - install(EXPORT ${package_name} -- DESTINATION lib/cmake/${package_name} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} - FILE ${package_name}Targets.cmake - NAMESPACE ${package_name}:: - ) -@@ -42,5 +42,5 @@ install(EXPORT ${package_name} - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" -- DESTINATION lib/cmake/${package_name} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} - ) ---- a/examples/CMakeLists.txt -+++ b/examples/CMakeLists.txt -@@ -65,7 +65,7 @@ endforeach() - - ## install binaries - install(TARGETS ${EXECUTABLES} EXPORT PahoMqttCppSamples -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION {CMAKE_INSTALL_BINDIR} - ) - - ## Build the SSL/TLS samples, if selected -@@ -80,7 +80,7 @@ if(PAHO_WITH_SSL) - endforeach() - - install(TARGETS ${SSL_EXECUTABLES} EXPORT PahoMqttCppSamples -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION {CMAKE_INSTALL_BINDIR} - ) - endif() - diff --git a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.5.3.bb similarity index 72% rename from meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb rename to meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.5.3.bb index 6f2efcda50..f4f01e69db 100644 --- a/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb +++ b/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.5.3.bb @@ -10,11 +10,7 @@ LIC_FILES_CHKSUM = " \ file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ " -SRC_URI = "gitsm://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=v1.4.x \ - file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \ - " -SRCREV = "ac1b023eab789e829656144f12b248602c40e37b" -PV .= "+git" +SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=master;tag=v${PV}" DEPENDS = "openssl paho-mqtt-c"