From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../0001-test-fix-32bit-linux-regress.patch | 48 ++++++++++++++++++++++ .../libevent/Makefile-missing-test-dir.patch | 27 ++++++++++++ .../recipes-support/libevent/libevent/run-ptest | 18 ++++++++ .../recipes-support/libevent/libevent_2.1.8.bb | 43 +++++++++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch create mode 100644 poky/meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch create mode 100644 poky/meta/recipes-support/libevent/libevent/run-ptest create mode 100644 poky/meta/recipes-support/libevent/libevent_2.1.8.bb (limited to 'poky/meta/recipes-support/libevent') diff --git a/poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch b/poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch new file mode 100644 index 000000000..36d08204f --- /dev/null +++ b/poky/meta/recipes-support/libevent/libevent/0001-test-fix-32bit-linux-regress.patch @@ -0,0 +1,48 @@ +From 69a3813c513c84e02212250c3d5b8a02ecefa698 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Mon, 15 Jan 2018 08:00:33 +0000 +Subject: [PATCH] test: fix 32bit linux regress + +This patch comes from https://github.com/libevent/libevent.git, +the commit is 63c4bf78d6af3c6ff46d2e8e4b53dd9f577a9ca9 + +Upstream-Status: Backport + +Signed-off-by: Mingli Yu +--- + configure.ac | 1 + + test/regress_util.c | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 7528d37..e64cb1f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -663,6 +663,7 @@ AC_CHECK_SIZEOF(short) + AC_CHECK_SIZEOF(size_t) + AC_CHECK_SIZEOF(void *) + AC_CHECK_SIZEOF(off_t) ++AC_CHECK_SIZEOF(time_t) + + AC_CHECK_TYPES([struct in6_addr, struct sockaddr_in6, sa_family_t, struct addrinfo, struct sockaddr_storage], , , + [#define _GNU_SOURCE +diff --git a/test/regress_util.c b/test/regress_util.c +index ef6a148..0c7eafb 100644 +--- a/test/regress_util.c ++++ b/test/regress_util.c +@@ -1412,10 +1412,12 @@ static struct date_rfc1123_case { + { 1289433600, "Thu, 11 Nov 2010 00:00:00 GMT"}, + { 1323648000, "Mon, 12 Dec 2011 00:00:00 GMT"}, + #ifndef _WIN32 ++#if EVENT__SIZEOF_TIME_T > 4 + /** In win32 case we have max "23:59:59 January 18, 2038, UTC" for time32 */ + { 4294967296, "Sun, 07 Feb 2106 06:28:16 GMT"} /* 2^32 */, + /** In win32 case we have max "23:59:59, December 31, 3000, UTC" for time64 */ + {253402300799, "Fri, 31 Dec 9999 23:59:59 GMT"} /* long long future no one can imagine */, ++#endif /* time_t != 32bit */ + { 1456704000, "Mon, 29 Feb 2016 00:00:00 GMT"} /* leap year */, + #endif + { 1435708800, "Wed, 01 Jul 2015 00:00:00 GMT"} /* leap second */, +-- +2.13.3 + diff --git a/poky/meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch b/poky/meta/recipes-support/libevent/libevent/Makefile-missing-test-dir.patch new file mode 100644 index 000000000..8880bd040 --- /dev/null +++ b/poky/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/poky/meta/recipes-support/libevent/libevent/run-ptest b/poky/meta/recipes-support/libevent/libevent/run-ptest new file mode 100644 index 000000000..0241851c7 --- /dev/null +++ b/poky/meta/recipes-support/libevent/libevent/run-ptest @@ -0,0 +1,18 @@ +#!/bin/sh + +fail=0 +for test in ./test/* +do + $test + if [ $? -ne 0 ] + then + fail=1 + fi +done + +if [ $fail -eq 0 ] +then + echo "PASS: libevent" +else + echo "FAIL: libevent" +fi diff --git a/poky/meta/recipes-support/libevent/libevent_2.1.8.bb b/poky/meta/recipes-support/libevent/libevent_2.1.8.bb new file mode 100644 index 000000000..83ce4644c --- /dev/null +++ b/poky/meta/recipes-support/libevent/libevent_2.1.8.bb @@ -0,0 +1,43 @@ +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://0001-test-fix-32bit-linux-regress.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 v1.2.3