diff --git a/meta-oe/recipes-support/poco/poco/0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch b/meta-oe/recipes-support/poco/poco/0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch index 734b65efa2..293321bfa8 100644 --- a/meta-oe/recipes-support/poco/poco/0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch +++ b/meta-oe/recipes-support/poco/poco/0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch @@ -22,7 +22,7 @@ diff --git a/dependencies/quill/include/quill/core/Rdtsc.h b/dependencies/quill/ index 3d0ae9f26..67f26cb89 100644 --- a/dependencies/quill/include/quill/core/Rdtsc.h +++ b/dependencies/quill/include/quill/core/Rdtsc.h -@@ -100,7 +100,7 @@ QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept +@@ -95,7 +95,7 @@ QUILL_NODISCARD QUILL_ATTRIBUTE_HOT inline uint64_t rdtsc() noexcept __asm__ volatile("stck %0" : "=Q"(tsc) : : "cc"); return tsc; } diff --git a/meta-oe/recipes-support/poco/poco_1.15.1.bb b/meta-oe/recipes-support/poco/poco_1.15.2.bb similarity index 92% rename from meta-oe/recipes-support/poco/poco_1.15.1.bb rename to meta-oe/recipes-support/poco/poco_1.15.2.bb index b50d1ee4ec..5a873a1d85 100644 --- a/meta-oe/recipes-support/poco/poco_1.15.1.bb +++ b/meta-oe/recipes-support/poco/poco_1.15.2.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/pocoproject/poco.git;branch=poco-${PV};protocol=http file://0003-quill-rdtsc-fallback-for-32-bit-powerpc.patch \ file://run-ptest \ " -SRCREV = "a1aacbba1bda4301db01bb1a2c2ab80677756b90" +SRCREV = "afbb1ab68f29eec7079e2fdfa04b3efdbec6529d" UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P\d+(\.\d+)+)" @@ -76,11 +76,6 @@ EXTRA_OECMAKE:append:class-native = " -DPOCO_UNBUNDLED=OFF" # do not use rpath EXTRA_OECMAKE:append = " -DCMAKE_SKIP_RPATH=ON" -LDFLAGS:append:riscv32 = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" -LDFLAGS:append:mips = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" -LDFLAGS:append:powerpc = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" -LDFLAGS:append:x86 = "${@bb.utils.contains('PACKAGECONFIG', 'Prometheus', ' -Wl,--no-as-needed -latomic -Wl,--as-needed', '', d)}" - python populate_packages:prepend () { poco_libdir = d.expand('${libdir}') pn = d.getVar("PN")