summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-04-03 18:11:14 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-08 10:53:17 +0100
commitea4f0dae9c608ed1fb88ecf6550ee8dfa9c0b8ec (patch)
treeee23db413d43bc387d77c8ac01b1eddd762ad1b7
parent801269e9998e9e1d830f0f8dbfb98220d90d1563 (diff)
downloadpoky-ea4f0dae9c608ed1fb88ecf6550ee8dfa9c0b8ec.tar.gz
libevent: update 2.0.21 -> 2.0.22
(From OE-Core rev: 08285ef71e1b506e5802eedeefc6a6650af3cb48) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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.22.bb (renamed from meta/recipes-support/libevent/libevent_2.0.21.bb)11
3 files changed, 3 insertions, 38 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
deleted file mode 100644
index 5d2c69036b..0000000000
--- a/meta/recipes-support/libevent/libevent-2.0.21/disable_tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
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
deleted file mode 100644
index b55923220c..0000000000
--- a/meta/recipes-support/libevent/libevent-2.0.21/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
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.22.bb
index e198f09962..3f9475ed75 100644
--- a/meta/recipes-support/libevent/libevent_2.0.21.bb
+++ b/meta/recipes-support/libevent/libevent_2.0.22.bb
@@ -6,15 +6,10 @@ SECTION = "libs"
6LICENSE = "BSD" 6LICENSE = "BSD"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559"
8 8
9PR = "r1" 9SRC_URI = "${SOURCEFORGE_MIRROR}/levent/${BP}-stable.tar.gz"
10 10
11SRC_URI = "${SOURCEFORGE_MIRROR}/levent/${BP}-stable.tar.gz \ 11SRC_URI[md5sum] = "c4c56f986aa985677ca1db89630a2e11"
12 file://obsolete_automake_macros.patch \ 12SRC_URI[sha256sum] = "71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3"
13 file://disable_tests.patch \
14"
15
16SRC_URI[md5sum] = "b2405cc9ebf264aa47ff615d9de527a2"
17SRC_URI[sha256sum] = "22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5"
18 13
19S = "${WORKDIR}/${BPN}-${PV}-stable" 14S = "${WORKDIR}/${BPN}-${PV}-stable"
20 15