From 028f3aaa29e23f0eff044698e7a39ec327450d49 Mon Sep 17 00:00:00 2001 From: Andrej Valek Date: Tue, 25 Apr 2017 08:11:48 +0200 Subject: 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. Signed-off-by: Andrej Valek Signed-off-by: Pascal Bach Signed-off-by: Ross Burton --- .../libevent/Makefile-missing-test-dir.patch | 27 ++++++++++++++ meta/recipes-support/libevent/libevent_2.0.22.bb | 41 --------------------- meta/recipes-support/libevent/libevent_2.1.8.bb | 42 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 41 deletions(-) create mode 100644 meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch delete mode 100644 meta/recipes-support/libevent/libevent_2.0.22.bb create mode 100644 meta/recipes-support/libevent/libevent_2.1.8.bb (limited to 'meta/recipes-support/libevent') 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 @@ +Fix missing test directory creation. + +GCC used in OE-core has "dependency tracking" disabled and +libevent has problem with this. +Due to removed makefile.am/in files in test/sample/include +directories, output directories are not created in +configuration step. Compilation step will fails, when +trying to write to non-existing directory. + +Upstream-Status: Inappropriate [Other] +Workaround specific to our build system. + +Signed-off-by: Andrej Valek +Signed-off-by: Pascal Bach + +diff --git a/libevent-2.1.8-stable/test/include.am b/libevent-2.1.8-stable/test/include.am +index eea249f..d323dff 100644 +--- a/test/include.am ++++ b/test/include.am +@@ -161,6 +161,7 @@ test_bench_httpclient_LDADD = $(LIBEVENT_GC_SECTIONS) libevent_core.la + test/regress.gen.c test/regress.gen.h: test/rpcgen-attempted + + test/rpcgen-attempted: test/regress.rpc event_rpcgen.py test/rpcgen_wrapper.sh ++ @$(MKDIR_P) test + $(AM_V_GEN)date -u > $@ + $(AM_V_at)if $(srcdir)/test/rpcgen_wrapper.sh $(srcdir)/test; then \ + true; \ diff --git a/meta/recipes-support/libevent/libevent_2.0.22.bb b/meta/recipes-support/libevent/libevent_2.0.22.bb deleted file mode 100644 index df8a31c58d..0000000000 --- a/meta/recipes-support/libevent/libevent_2.0.22.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "An asynchronous event notification library" -HOMEPAGE = "http://libevent.org/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=50884&atid=461322" -SECTION = "libs" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559" - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/levent/${BP}-stable.tar.gz \ - file://run-ptest \ -" - -SRC_URI[md5sum] = "c4c56f986aa985677ca1db89630a2e11" -SRC_URI[sha256sum] = "71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3" - -UPSTREAM_CHECK_URI = "http://libevent.org/" - -S = "${WORKDIR}/${BPN}-${PV}-stable" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" - -inherit autotools - -# Needed for Debian packaging -LEAD_SONAME = "libevent-2.0.so" - -inherit ptest - -DEPENDS = "zlib" - -BBCLASSEXTEND = "native nativesdk" - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/test - for file in ${B}/test/.libs/regress ${B}/test/.libs/test* - do - install -m 0755 $file ${D}${PTEST_PATH}/test - done -} diff --git a/meta/recipes-support/libevent/libevent_2.1.8.bb b/meta/recipes-support/libevent/libevent_2.1.8.bb new file mode 100644 index 0000000000..1270d627f8 --- /dev/null +++ b/meta/recipes-support/libevent/libevent_2.1.8.bb @@ -0,0 +1,42 @@ +SUMMARY = "An asynchronous event notification library" +HOMEPAGE = "http://libevent.org/" +BUGTRACKER = "https://github.com/libevent/libevent/issues" +SECTION = "libs" + +LICENSE = "BSD & MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=17f20574c0b154d12236d5fbe964f549" + +SRC_URI = " \ + https://github.com/libevent/libevent/releases/download/release-${PV}-stable/${BP}-stable.tar.gz \ + file://Makefile-missing-test-dir.patch \ + file://run-ptest \ +" + +SRC_URI[md5sum] = "f3eeaed018542963b7d2416ef1135ecc" +SRC_URI[sha256sum] = "965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2" + +UPSTREAM_CHECK_URI = "http://libevent.org/" + +S = "${WORKDIR}/${BPN}-${PV}-stable" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" + +inherit autotools + +# Needed for Debian packaging +LEAD_SONAME = "libevent-2.1.so" + +inherit ptest + +DEPENDS = "zlib" + +BBCLASSEXTEND = "native nativesdk" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/test + for file in ${B}/test/.libs/regress ${B}/test/.libs/test* + do + install -m 0755 $file ${D}${PTEST_PATH}/test + done +} -- cgit 1.2.3-korg