summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-02-11 06:00:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-12 13:22:43 +0000
commit17541bee4f41eb8c9240a0d962af3f422ac894f3 (patch)
tree436ad2c9cabd83ccec03abd02debb99a0d1d47df /meta/recipes-support
parent40962b8a4866c4797cd5daa6223f23c6ac1fac0e (diff)
downloadpoky-17541bee4f41eb8c9240a0d962af3f422ac894f3.tar.gz
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 <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libevent/libevent-2.0.21/disable_tests.patch15
-rw-r--r--meta/recipes-support/libevent/libevent-2.0.21/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-support/libevent/libevent_2.0.21.bb7
3 files changed, 35 insertions, 2 deletions
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 0000000000..5d2c69036b
--- /dev/null
+++ b/meta/recipes-support/libevent/libevent-2.0.21/disable_tests.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Inappropriate [disable feature]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd libevent-2.0.21-stable/test/Makefile.am libevent-2.0.21-stable/test/Makefile.am
5--- libevent-2.0.21-stable/test/Makefile.am 2012-05-31 07:08:19.000000000 +0300
6+++ libevent-2.0.21-stable/test/Makefile.am 2013-02-08 02:06:20.227475872 +0200
7@@ -19,8 +19,6 @@
8 EXTRA_PROGRAMS = regress
9 noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.h
10
11-TESTS = $(top_srcdir)/test/test.sh
12-
13 BUILT_SOURCES =
14 if BUILD_REGRESS
15 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 0000000000..b55923220c
--- /dev/null
+++ b/meta/recipes-support/libevent/libevent-2.0.21/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Submitted [https://sourceforge.net/tracker/?func=detail&aid=3603774&group_id=50884&atid=461322]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd libevent-2.0.21-stable/configure.in libevent-2.0.21-stable/configure.in
5--- libevent-2.0.21-stable/configure.in 2012-11-18 08:34:13.000000000 +0200
6+++ libevent-2.0.21-stable/configure.in 2013-02-08 02:03:58.403476183 +0200
7@@ -12,7 +12,7 @@
8 AC_CONFIG_MACRO_DIR([m4])
9
10 AM_INIT_AUTOMAKE(libevent,2.0.21-stable)
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13 AC_DEFINE(NUMERIC_VERSION, 0x02001500, [Numeric representation of the version])
14
15 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 3c53de96c6..2fbe65968f 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"
7LICENSE = "BSD" 7LICENSE = "BSD"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559"
9 9
10PR = "r0" 10PR = "r1"
11 11
12SRC_URI = "http://github.com/downloads/libevent/libevent/${BPN}-${PV}-stable.tar.gz" 12SRC_URI = "http://github.com/downloads/libevent/libevent/${BPN}-${PV}-stable.tar.gz \
13 file://obsolete_automake_macros.patch \
14 file://disable_tests.patch \
15"
13 16
14SRC_URI[md5sum] = "b2405cc9ebf264aa47ff615d9de527a2" 17SRC_URI[md5sum] = "b2405cc9ebf264aa47ff615d9de527a2"
15SRC_URI[sha256sum] = "22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5" 18SRC_URI[sha256sum] = "22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5"