Skip to contentSkip to conversation

cmocka: Fix buils with LTO

PATCH New Khem Raj 1 participant 1 message Nov 9, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH v2 1/1 cmocka: Fix buils with LTO

Update to latest on master
Drop uintptr_t patch, its fixed upstream differently Package up the new library libproc_uptime.so needed by examples Add it to INSANE_SKIP for examples

---
v2: Package missing libproc_uptime.so

 meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb   | 10 ++--
 .../cmocka/files/cmocka-uintptr_t.patch       | 53 -------------------
 2 files changed, 7 insertions(+), 56 deletions(-)
 delete mode 100644 meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch
meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb +7 -3
index 5aee5ef931..e4afa43e97 100644
@@ -6,17 +6,19 @@ HOMEPAGE = "https://cmocka.org/"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "56eb3a183fc222120f86d0c54fd033992c30135e"
+SRCREV = "a4fc3dd7705c277e3a57432895e9852ea105dac9"
+PV .= "+git${SRCPV}"
 SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git \
            file://run-ptest \
-           file://cmocka-uintptr_t.patch \
           "
 
 S = "${WORKDIR}/git"
 
 inherit cmake ptest
 
-EXTRA_OECMAKE = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}"
+EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}"
+# Use -Wl,wrap linker flag, which does not work with LTO
+LTO = ""
 
 do_install_append () {
     install -d ${D}${datadir}/${BPN}/example
@@ -27,6 +29,7 @@ do_install_append () {
     install -m 0755 ${B}/example/mock/chef_wrap/waiter_test_wrap ${D}/${datadir}/${BPN}/example/mock/chef_wrap
     install -m 0755 ${B}/example/mock/uptime/uptime ${D}/${datadir}/${BPN}/example/mock/uptime
     install -m 0755 ${B}/example/mock/uptime/test_uptime ${D}/${datadir}/${BPN}/example/mock/uptime
+    install -m 0644 ${B}/example/mock/uptime/libproc_uptime.so ${D}/${datadir}/${BPN}/example/mock/libproc_uptime.so
 }
 
 do_install_ptest () {
@@ -37,3 +40,4 @@ do_install_ptest () {
 PACKAGE_BEFORE_PN += "${PN}-examples"
 
 FILES_${PN}-examples = "${datadir}/${BPN}/example"
+INSANE_SKIP_${PN}-examples = "libdir"
meta-oe/recipes-test/cmocka/files/cmocka-uintptr_t.patch deleted +0 -53

53 lines not on this page · raw message

Signature · 1 line
2.29.2