From 8b8acadda48ebe9c109040e9dc2983e005e2ae9d Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 11 Feb 2013 06:00:18 +0200 Subject: [PATCH] libevent: fix build with automake-1.13 - Add obsolete_automake_macros.patch that replaces automake macros no longer supported by automake-1.13 with modern constructs. - Use of $(top_srcdir) in TESTS is an error causing automake-1.13 to abort. Disable the tests completely. (From OE-Core rev: 751b5e76768d9fa4e40405a12ad008aa9af1561d) Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../libevent/libevent-2.0.21/disable_tests.patch | 15 +++++++++++++++ .../libevent-2.0.21/obsolete_automake_macros.patch | 15 +++++++++++++++ meta/recipes-support/libevent/libevent_2.0.21.bb | 7 +++++-- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/libevent/libevent-2.0.21/disable_tests.patch create mode 100644 meta/recipes-support/libevent/libevent-2.0.21/obsolete_automake_macros.patch diff --git a/meta/recipes-support/libevent/libevent-2.0.21/disable_tests.patch b/meta/recipes-support/libevent/libevent-2.0.21/disable_tests.patch new file mode 100644 index 0000000..5d2c690 --- /dev/null +++ b/meta/recipes-support/libevent/libevent-2.0.21/disable_tests.patch @@ -0,0 +1,15 @@ +Upstream-Status: Inappropriate [disable feature] + +Signed-off-by: Marko Lindqvist +diff -Nurd libevent-2.0.21-stable/test/Makefile.am libevent-2.0.21-stable/test/Makefile.am +--- libevent-2.0.21-stable/test/Makefile.am 2012-05-31 07:08:19.000000000 +0300 ++++ libevent-2.0.21-stable/test/Makefile.am 2013-02-08 02:06:20.227475872 +0200 +@@ -19,8 +19,6 @@ + EXTRA_PROGRAMS = regress + noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.h + +-TESTS = $(top_srcdir)/test/test.sh +- + BUILT_SOURCES = + if BUILD_REGRESS + BUILT_SOURCES += regress.gen.c regress.gen.h diff --git a/meta/recipes-support/libevent/libevent-2.0.21/obsolete_automake_macros.patch b/meta/recipes-support/libevent/libevent-2.0.21/obsolete_automake_macros.patch new file mode 100644 index 0000000..b559232 --- /dev/null +++ b/meta/recipes-support/libevent/libevent-2.0.21/obsolete_automake_macros.patch @@ -0,0 +1,15 @@ +Upstream-Status: Submitted [https://sourceforge.net/tracker/?func=detail&aid=3603774&group_id=50884&atid=461322] + +Signed-off-by: Marko Lindqvist +diff -Nurd libevent-2.0.21-stable/configure.in libevent-2.0.21-stable/configure.in +--- libevent-2.0.21-stable/configure.in 2012-11-18 08:34:13.000000000 +0200 ++++ libevent-2.0.21-stable/configure.in 2013-02-08 02:03:58.403476183 +0200 +@@ -12,7 +12,7 @@ + AC_CONFIG_MACRO_DIR([m4]) + + AM_INIT_AUTOMAKE(libevent,2.0.21-stable) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_DEFINE(NUMERIC_VERSION, 0x02001500, [Numeric representation of the version]) + + dnl Initialize prefix. diff --git a/meta/recipes-support/libevent/libevent_2.0.21.bb b/meta/recipes-support/libevent/libevent_2.0.21.bb index 3c53de9..2fbe659 100644 --- a/meta/recipes-support/libevent/libevent_2.0.21.bb +++ b/meta/recipes-support/libevent/libevent_2.0.21.bb @@ -7,9 +7,12 @@ SECTION = "libs" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559" -PR = "r0" +PR = "r1" -SRC_URI = "http://github.com/downloads/libevent/libevent/${BPN}-${PV}-stable.tar.gz" +SRC_URI = "http://github.com/downloads/libevent/libevent/${BPN}-${PV}-stable.tar.gz \ + file://obsolete_automake_macros.patch \ + file://disable_tests.patch \ +" SRC_URI[md5sum] = "b2405cc9ebf264aa47ff615d9de527a2" SRC_URI[sha256sum] = "22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5" -- 2.7.4