diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2017-04-25 08:11:48 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-16 14:08:29 +0100 |
commit | 2865683b6ab82663b1dc03809fc2262173ade4a3 (patch) | |
tree | 19bc892382a5e1f52ca66de199f542f8327d0c98 | |
parent | c43c3ec8f96245ca2806cf28329919e44a83d326 (diff) | |
download | poky-2865683b6ab82663b1dc03809fc2262173ade4a3.tar.gz |
libevent: 2.0.22 -> 2.1.8
Update libevent to version 2.1.8 and fix test directory creation
License file has been changed due to new MIT license in source code.
(From OE-Core rev: 028f3aaa29e23f0eff044698e7a39ec327450d49)
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch | 27 | ||||
-rw-r--r-- | meta/recipes-support/libevent/libevent_2.1.8.bb (renamed from meta/recipes-support/libevent/libevent_2.0.22.bb) | 15 |
2 files changed, 35 insertions, 7 deletions
diff --git a/meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch b/meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch new file mode 100644 index 0000000000..8880bd0407 --- /dev/null +++ b/meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | Fix missing test directory creation. | ||
2 | |||
3 | GCC used in OE-core has "dependency tracking" disabled and | ||
4 | libevent has problem with this. | ||
5 | Due to removed makefile.am/in files in test/sample/include | ||
6 | directories, output directories are not created in | ||
7 | configuration step. Compilation step will fails, when | ||
8 | trying to write to non-existing directory. | ||
9 | |||
10 | Upstream-Status: Inappropriate [Other] | ||
11 | Workaround specific to our build system. | ||
12 | |||
13 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | ||
14 | Signed-off-by: Pascal Bach <pascal.bach@siemens.com> | ||
15 | |||
16 | diff --git a/libevent-2.1.8-stable/test/include.am b/libevent-2.1.8-stable/test/include.am | ||
17 | index eea249f..d323dff 100644 | ||
18 | --- a/test/include.am | ||
19 | +++ b/test/include.am | ||
20 | @@ -161,6 +161,7 @@ test_bench_httpclient_LDADD = $(LIBEVENT_GC_SECTIONS) libevent_core.la | ||
21 | test/regress.gen.c test/regress.gen.h: test/rpcgen-attempted | ||
22 | |||
23 | test/rpcgen-attempted: test/regress.rpc event_rpcgen.py test/rpcgen_wrapper.sh | ||
24 | + @$(MKDIR_P) test | ||
25 | $(AM_V_GEN)date -u > $@ | ||
26 | $(AM_V_at)if $(srcdir)/test/rpcgen_wrapper.sh $(srcdir)/test; then \ | ||
27 | true; \ | ||
diff --git a/meta/recipes-support/libevent/libevent_2.0.22.bb b/meta/recipes-support/libevent/libevent_2.1.8.bb index df8a31c58d..1270d627f8 100644 --- a/meta/recipes-support/libevent/libevent_2.0.22.bb +++ b/meta/recipes-support/libevent/libevent_2.1.8.bb | |||
@@ -1,18 +1,19 @@ | |||
1 | SUMMARY = "An asynchronous event notification library" | 1 | SUMMARY = "An asynchronous event notification library" |
2 | HOMEPAGE = "http://libevent.org/" | 2 | HOMEPAGE = "http://libevent.org/" |
3 | BUGTRACKER = "http://sourceforge.net/tracker/?group_id=50884&atid=461322" | 3 | BUGTRACKER = "https://github.com/libevent/libevent/issues" |
4 | SECTION = "libs" | 4 | SECTION = "libs" |
5 | 5 | ||
6 | LICENSE = "BSD" | 6 | LICENSE = "BSD & MIT" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=17f20574c0b154d12236d5fbe964f549" |
8 | 8 | ||
9 | SRC_URI = " \ | 9 | SRC_URI = " \ |
10 | ${SOURCEFORGE_MIRROR}/levent/${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://run-ptest \ | 12 | file://run-ptest \ |
12 | " | 13 | " |
13 | 14 | ||
14 | SRC_URI[md5sum] = "c4c56f986aa985677ca1db89630a2e11" | 15 | SRC_URI[md5sum] = "f3eeaed018542963b7d2416ef1135ecc" |
15 | SRC_URI[sha256sum] = "71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3" | 16 | SRC_URI[sha256sum] = "965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2" |
16 | 17 | ||
17 | UPSTREAM_CHECK_URI = "http://libevent.org/" | 18 | UPSTREAM_CHECK_URI = "http://libevent.org/" |
18 | 19 | ||
@@ -24,7 +25,7 @@ PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" | |||
24 | inherit autotools | 25 | inherit autotools |
25 | 26 | ||
26 | # Needed for Debian packaging | 27 | # Needed for Debian packaging |
27 | LEAD_SONAME = "libevent-2.0.so" | 28 | LEAD_SONAME = "libevent-2.1.so" |
28 | 29 | ||
29 | inherit ptest | 30 | inherit ptest |
30 | 31 | ||