diff options
author | Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2019-06-19 11:58:32 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-19 22:13:39 +0100 |
commit | f9ac711afb40b9803be3860983948034e0526c96 (patch) | |
tree | 786a76f181402958ad00f00421f2131455f93a0f /meta/recipes-support/libevent | |
parent | 4782ccbbde1ca859e7aa9f8699bd903e9582b585 (diff) | |
download | poky-f9ac711afb40b9803be3860983948034e0526c96.tar.gz |
libevent:upgrade 2.1.8 -> 2.1.10
-Upgrade from libevent_2.1.8.bb to libevent_2.1.10.bb.
-libevent/0001-test-fix-32bit-linux-regress.patch
Removed since this is included in 2.1.10.
(From OE-Core rev: 40ea686112e4def38363edb4a5b1cec2692e34da)
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libevent')
-rw-r--r-- | meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch | 48 | ||||
-rw-r--r-- | meta/recipes-support/libevent/libevent_2.1.10.bb (renamed from meta/recipes-support/libevent/libevent_2.1.8.bb) | 5 |
2 files changed, 2 insertions, 51 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 deleted file mode 100644 index 36d08204f7..0000000000 --- a/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From 69a3813c513c84e02212250c3d5b8a02ecefa698 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <Mingli.Yu@windriver.com> | ||
3 | Date: Mon, 15 Jan 2018 08:00:33 +0000 | ||
4 | Subject: [PATCH] test: fix 32bit linux regress | ||
5 | |||
6 | This patch comes from https://github.com/libevent/libevent.git, | ||
7 | the commit is 63c4bf78d6af3c6ff46d2e8e4b53dd9f577a9ca9 | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | |||
11 | Signed-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 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index 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 | ||
29 | diff --git a/test/regress_util.c b/test/regress_util.c | ||
30 | index 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 | -- | ||
47 | 2.13.3 | ||
48 | |||
diff --git a/meta/recipes-support/libevent/libevent_2.1.8.bb b/meta/recipes-support/libevent/libevent_2.1.10.bb index 0f91e05a6c..81ceb1cd91 100644 --- a/meta/recipes-support/libevent/libevent_2.1.8.bb +++ b/meta/recipes-support/libevent/libevent_2.1.10.bb | |||
@@ -9,12 +9,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=17f20574c0b154d12236d5fbe964f549" | |||
9 | SRC_URI = " \ | 9 | SRC_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 \ | ||
13 | file://run-ptest \ | 12 | file://run-ptest \ |
14 | " | 13 | " |
15 | 14 | ||
16 | SRC_URI[md5sum] = "f3eeaed018542963b7d2416ef1135ecc" | 15 | SRC_URI[md5sum] = "999caf86f52943af2363bc8077f00167" |
17 | SRC_URI[sha256sum] = "965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2" | 16 | SRC_URI[sha256sum] = "e864af41a336bb11dab1a23f32993afe963c1f69618bd9292b89ecf6904845b0" |
18 | 17 | ||
19 | UPSTREAM_CHECK_URI = "http://libevent.org/" | 18 | UPSTREAM_CHECK_URI = "http://libevent.org/" |
20 | 19 | ||