From 9fb5981859873f76b1a4a2c31c08acf19cf437cf Mon Sep 17 00:00:00 2001 From: Liu Yiding Date: Tue, 25 Nov 2025 16:53:28 +0800 Subject: sdbus-c++: upgrade 2.1.0 -> 2.2.1 Changelog: https://github.com/Kistler-Group/sdbus-cpp/releases/tag/v2.2.1 Signed-off-by: Liu Yiding Signed-off-by: Khem Raj --- meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.1.0.bb | 49 ----------------------- meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.2.1.bb | 49 +++++++++++++++++++++++ 2 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.1.0.bb create mode 100644 meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.2.1.bb diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.1.0.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.1.0.bb deleted file mode 100644 index 62b30e9894..0000000000 --- a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.1.0.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "sdbus-c++" -DESCRIPTION = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API in modern C++" - -SECTION = "libs" - -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=1803fa9c2c3ce8cb06b4861d75310742" - -inherit cmake pkgconfig systemd ptest - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-external-libsystemd', 'with-builtin-libsystemd', d)} \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" -PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap,basu" -PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd" -PACKAGECONFIG[with-tests] = "-DSDBUSCPP_BUILD_TESTS=ON -DSDBUSCPP_INSTALL_TESTS=ON -DSDBUSCPP_TESTS_INSTALL_PATH=${PTEST_PATH},-DSDBUSCPP_BUILD_TESTS=OFF,googletest gmock" - -DEPENDS += "expat" - -SRCREV = "0261d0ec60b68c1f0a6ec9acf63d1379f7d569f8" -SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;tag=v${PV} \ - file://run-ptest" - -EXTRA_OECMAKE = "-DSDBUSCPP_BUILD_CODEGEN=OFF \ - -DSDBUSCPP_BUILD_DOCS=ON \ - -DSDBUSCPP_BUILD_DOXYGEN_DOCS=OFF" - - -# Link libatomic on architectures without 64bit atomics fixes -# libsdbus-c++.so.1.1.0: undefined reference to `__atomic_load_8' -LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed" -LDFLAGS:append:powerpc = " -Wl,--no-as-needed -latomic -Wl,--as-needed" -LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed" - -do_install:append() { - if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then - rm -rf ${D}${sysconfdir}/dbus-1 - fi -} - -do_install_ptest() { - DESTDIR='${D}' cmake_runcmake_build --target tests/install -} - -FILES:${PN}-ptest =+ "${sysconfdir}/dbus-1/system.d/" -FILES:${PN}-dev += "${bindir}/sdbus-c++-xml2cpp" - -RDEPENDS:${PN}-ptest += "${VIRTUAL-RUNTIME_dbus}" -# It adds -isystem which is spurious, no idea where it gets it from -CCACHE_DISABLE = "1" diff --git a/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.2.1.bb b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.2.1.bb new file mode 100644 index 0000000000..6cacb5dfe8 --- /dev/null +++ b/meta-oe/recipes-core/sdbus-c++/sdbus-c++_2.2.1.bb @@ -0,0 +1,49 @@ +SUMMARY = "sdbus-c++" +DESCRIPTION = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API in modern C++" + +SECTION = "libs" + +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1803fa9c2c3ce8cb06b4861d75310742" + +inherit cmake pkgconfig systemd ptest + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-external-libsystemd', 'with-builtin-libsystemd', d)} \ + ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" +PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap,basu" +PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd" +PACKAGECONFIG[with-tests] = "-DSDBUSCPP_BUILD_TESTS=ON -DSDBUSCPP_INSTALL_TESTS=ON -DSDBUSCPP_TESTS_INSTALL_PATH=${PTEST_PATH},-DSDBUSCPP_BUILD_TESTS=OFF,googletest gmock" + +DEPENDS += "expat" + +SRCREV = "28b78822cfc5fbec4bd9906168493e9985f586ed" +SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master;tag=v${PV} \ + file://run-ptest" + +EXTRA_OECMAKE = "-DSDBUSCPP_BUILD_CODEGEN=OFF \ + -DSDBUSCPP_BUILD_DOCS=ON \ + -DSDBUSCPP_BUILD_DOXYGEN_DOCS=OFF" + + +# Link libatomic on architectures without 64bit atomics fixes +# libsdbus-c++.so.1.1.0: undefined reference to `__atomic_load_8' +LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed" +LDFLAGS:append:powerpc = " -Wl,--no-as-needed -latomic -Wl,--as-needed" +LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed" + +do_install:append() { + if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then + rm -rf ${D}${sysconfdir}/dbus-1 + fi +} + +do_install_ptest() { + DESTDIR='${D}' cmake_runcmake_build --target tests/install +} + +FILES:${PN}-ptest =+ "${sysconfdir}/dbus-1/system.d/" +FILES:${PN}-dev += "${bindir}/sdbus-c++-xml2cpp" + +RDEPENDS:${PN}-ptest += "${VIRTUAL-RUNTIME_dbus}" +# It adds -isystem which is spurious, no idea where it gets it from +CCACHE_DISABLE = "1" -- cgit v1.2.3-54-g00ecf