diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-test')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb (renamed from meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.14.0.bb) | 4 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch | 41 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb | 6 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb | 8 |
4 files changed, 55 insertions, 4 deletions
diff --git a/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.14.0.bb b/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb index 04327862ce..92db31e1ea 100644 --- a/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.14.0.bb +++ b/meta-openembedded/meta-oe/recipes-test/cppunit/cppunit_1.15.1.bb @@ -8,7 +8,7 @@ SRC_URI = " \ http://dev-www.libreoffice.org/src/cppunit-${PV}.tar.gz \ file://0001-doc-Makefile.am-do-not-preserve-file-flags-when-copy.patch \ " -SRC_URI[md5sum] = "7ad93022171710a541bfe4bfd8b4a381" -SRC_URI[sha256sum] = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780" +SRC_URI[md5sum] = "9dc669e6145cadd9674873e24943e6dd" +SRC_URI[sha256sum] = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-openembedded/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch new file mode 100644 index 0000000000..706322d565 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -0,0 +1,41 @@ +From fa57c78c33d26084f85f1a6b4c29378631dc9395 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 30 Nov 2019 11:58:58 -0800 +Subject: [PATCH] Fix build on 32bit arches with 64bit time_t + +time element is deprecated on new input_event structure in kernel's +input.h [1] + +[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/libevdev/evtest/merge_requests/6] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + evtest.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/evtest.c b/evtest.c +index 548c203..93063cd 100644 +--- a/evtest.c ++++ b/evtest.c +@@ -61,6 +61,11 @@ + #include <sys/types.h> + #include <unistd.h> + ++#ifndef input_event_sec ++#define input_event_sec time.tv_sec ++#define input_event_usec time.tv_usec ++#endif ++ + #define BITS_PER_LONG (sizeof(long) * 8) + #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) + #define OFF(x) ((x)%BITS_PER_LONG) +@@ -1140,7 +1145,7 @@ static int print_events(int fd) + type = ev[i].type; + code = ev[i].code; + +- printf("Event: time %ld.%06ld, ", ev[i].time.tv_sec, ev[i].time.tv_usec); ++ printf("Event: time %ld.%06ld, ", ev[i].input_event_sec, ev[i].input_event_sec); + + if (type == EV_SYN) { + if (code == SYN_MT_REPORT) diff --git a/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb b/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb index 3b6dc61408..a3a23c8951 100644 --- a/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb +++ b/meta-openembedded/meta-oe/recipes-test/evtest/evtest_1.34.bb @@ -8,8 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libxml2" SRCREV = "16e5104127a620686bdddc4a9ad62881134d6c69" -SRC_URI = "git://anongit.freedesktop.org/evtest;protocol=git \ - file://add_missing_limits_h_include.patch" +SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https \ + file://add_missing_limits_h_include.patch \ + file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ + " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb index b675ea0f32..354e7de337 100644 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb @@ -21,3 +21,11 @@ ALLOW_EMPTY_${PN}-dbg = "1" RDEPENDS_${PN}-dev += "${PN}-staticdev" BBCLASSEXTEND = "native nativesdk" + +do_configure_prepend() { + # explicitly use python3 + # the scripts are already python3 compatible since https://github.com/google/googletest/commit/d404af0d987a9c38cafce82a7e26ec8468c88361 and other fixes like this + # but since this oe-core change http://git.openembedded.org/openembedded-core/commit/?id=5f8f16b17f66966ae91aeabc23e97de5ecd17447 + # there isn't python in HOSTTOOLS so "env python" fails + sed -i 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@g' ${S}/googlemock/scripts/*py ${S}/googlemock/scripts/generator/*py ${S}/googlemock/scripts/generator/cpp/*py ${S}/googlemock/test/*py ${S}/googletest/scripts/*py ${S}/googletest/test/*py +} |