summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch47
-rw-r--r--meta/recipes-support/libevent/libevent_2.0.21.bb (renamed from meta/recipes-support/libevent/libevent_2.0.16.bb)11
2 files changed, 5 insertions, 53 deletions
diff --git a/meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch b/meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch
deleted file mode 100644
index ef42863c94..0000000000
--- a/meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1Upstream-Status: pending
2
3Pulled the patch from gentoo: from here:
4http://sources2.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libevent/files/libevent-2.0.16-sysctl.patch?revision=1.1
5
6Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
72012/01/04
8
9From 358c745e5432f7648b6f8b3188f32b5551cbf9d6 Mon Sep 17 00:00:00 2001
10From: Mike Frysinger <vapier@gentoo.org>
11Date: Thu, 8 Dec 2011 11:39:48 -0500
12Subject: [PATCH] check for sysctl before we use it
13
14Not all C libraries under Linux support the sysctl() func.
15---
16 arc4random.c | 2 +-
17 configure.in | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/arc4random.c b/arc4random.c
21index 4833169..ef10fa8 100644
22--- a/arc4random.c
23+++ b/arc4random.c
24@@ -166,7 +166,7 @@ arc4_seed_win32(void)
25 }
26 #endif
27
28-#if defined(_EVENT_HAVE_SYS_SYSCTL_H)
29+#if defined(_EVENT_HAVE_SYS_SYSCTL_H) && defined(_EVENT_HAVE_SYSCTL)
30 #if _EVENT_HAVE_DECL_CTL_KERN && _EVENT_HAVE_DECL_KERN_RANDOM && _EVENT_HAVE_DECL_RANDOM_UUID
31 #define TRY_SEED_SYSCTL_LINUX
32 static int
33diff --git a/configure.in b/configure.in
34index da08cf4..4e24444 100644
35--- a/configure.in
36+++ b/configure.in
37@@ -267,7 +267,7 @@ AC_HEADER_TIME
38
39 dnl Checks for library functions.
40 AC_CHECK_FUNCS([gettimeofday vasprintf fcntl clock_gettime strtok_r strsep])
41-AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv])
42+AC_CHECK_FUNCS([getnameinfo strlcpy inet_ntop inet_pton signal sigaction strtoll inet_aton pipe eventfd sendfile mmap splice arc4random arc4random_buf issetugid geteuid getegid getprotobynumber setenv unsetenv putenv sysctl])
43
44 AC_CACHE_CHECK(
45 [for getaddrinfo],
46--
471.7.6.1
diff --git a/meta/recipes-support/libevent/libevent_2.0.16.bb b/meta/recipes-support/libevent/libevent_2.0.21.bb
index 1c464efb37..3c53de96c6 100644
--- a/meta/recipes-support/libevent/libevent_2.0.16.bb
+++ b/meta/recipes-support/libevent/libevent_2.0.21.bb
@@ -5,15 +5,14 @@ BUGTRACKER = "http://sourceforge.net/tracker/?group_id=50884&atid=461322"
5SECTION = "libs" 5SECTION = "libs"
6 6
7LICENSE = "BSD" 7LICENSE = "BSD"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=50aad300de703db62baae12146832b45" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559"
9 9
10PR = "r2" 10PR = "r0"
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://libevent-2.0.16_fix_for_x32.patch"
14 13
15SRC_URI[md5sum] = "899efcffccdb3d5111419df76e7dc8df" 14SRC_URI[md5sum] = "b2405cc9ebf264aa47ff615d9de527a2"
16SRC_URI[sha256sum] = "a578c7bcaf3bab1cc7924bd4d219f2ea621ab8c51dfc4f886e234b6ef4d38295" 15SRC_URI[sha256sum] = "22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5"
17 16
18S = "${WORKDIR}/${BPN}-${PV}-stable" 17S = "${WORKDIR}/${BPN}-${PV}-stable"
19 18