summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch48
-rw-r--r--meta/recipes-support/libevent/libevent_2.1.8.bb1
2 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch b/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch
new file mode 100644
index 0000000000..36d08204f7
--- /dev/null
+++ b/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch
@@ -0,0 +1,48 @@
1From 69a3813c513c84e02212250c3d5b8a02ecefa698 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <Mingli.Yu@windriver.com>
3Date: Mon, 15 Jan 2018 08:00:33 +0000
4Subject: [PATCH] test: fix 32bit linux regress
5
6This patch comes from https://github.com/libevent/libevent.git,
7the commit is 63c4bf78d6af3c6ff46d2e8e4b53dd9f577a9ca9
8
9Upstream-Status: Backport
10
11Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
12---
13 configure.ac | 1 +
14 test/regress_util.c | 2 ++
15 2 files changed, 3 insertions(+)
16
17diff --git a/configure.ac b/configure.ac
18index 7528d37..e64cb1f 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -663,6 +663,7 @@ AC_CHECK_SIZEOF(short)
22 AC_CHECK_SIZEOF(size_t)
23 AC_CHECK_SIZEOF(void *)
24 AC_CHECK_SIZEOF(off_t)
25+AC_CHECK_SIZEOF(time_t)
26
27 AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t, struct addrinfo, struct sockaddr_storage], , ,
28 [#define _GNU_SOURCE
29diff --git a/test/regress_util.c b/test/regress_util.c
30index ef6a148..0c7eafb 100644
31--- a/test/regress_util.c
32+++ b/test/regress_util.c
33@@ -1412,10 +1412,12 @@ static struct date_rfc1123_case {
34 { 1289433600, "Thu, 11 Nov 2010 00:00:00 GMT"},
35 { 1323648000, "Mon, 12 Dec 2011 00:00:00 GMT"},
36 #ifndef _WIN32
37+#if EVENT__SIZEOF_TIME_T > 4
38 /** In win32 case we have max "23:59:59 January 18, 2038, UTC" for time32 */
39 { 4294967296, "Sun, 07 Feb 2106 06:28:16 GMT"} /* 2^32 */,
40 /** In win32 case we have max "23:59:59, December 31, 3000, UTC" for time64 */
41 {253402300799, "Fri, 31 Dec 9999 23:59:59 GMT"} /* long long future no one can imagine */,
42+#endif /* time_t != 32bit */
43 { 1456704000, "Mon, 29 Feb 2016 00:00:00 GMT"} /* leap year */,
44 #endif
45 { 1435708800, "Wed, 01 Jul 2015 00:00:00 GMT"} /* leap second */,
46--
472.13.3
48
diff --git a/meta/recipes-support/libevent/libevent_2.1.8.bb b/meta/recipes-support/libevent/libevent_2.1.8.bb
index 1270d627f8..83ce4644cf 100644
--- a/meta/recipes-support/libevent/libevent_2.1.8.bb
+++ b/meta/recipes-support/libevent/libevent_2.1.8.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=17f20574c0b154d12236d5fbe964f549"
9SRC_URI = " \ 9SRC_URI = " \
10 https://github.com/libevent/libevent/releases/download/release-${PV}-stable/${BP}-stable.tar.gz \ 10 https://github.com/libevent/libevent/releases/download/release-${PV}-stable/${BP}-stable.tar.gz \
11 file://Makefile-missing-test-dir.patch \ 11 file://Makefile-missing-test-dir.patch \
12 file://0001-test-fix-32bit-linux-regress.patch \
12 file://run-ptest \ 13 file://run-ptest \
13" 14"
14 15