diff options
| author |   Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-01-04 13:49:37 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-06 11:27:28 +0000 |
| commit | 1d0006ad137e63214e365fbccd45a610cf9661ce (patch) | |
| tree | 67ce061b1252083fad8ab515eb198c74b95da77d /meta/recipes-support/libevent | |
| parent | 2f134791ca5db0281af0a71fcab0e832894d412c (diff) | |
| download | openembedded-core-1d0006ad137e63214e365fbccd45a610cf9661ce.tar.gz | |
libevent: fix compilation for x32
Pull a patch from gentoo to avoid sysctl syscall which is not
defined for x32.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-support/libevent')
| -rw-r--r-- | meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch | 47 | ||||
| -rw-r--r-- | meta/recipes-support/libevent/libevent_2.0.16.bb | 5 |
2 files changed, 50 insertions, 2 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 new file mode 100644 index 0000000000..ef42863c94 --- /dev/null +++ b/meta/recipes-support/libevent/libevent/libevent-2.0.16_fix_for_x32.patch @@ -0,0 +1,47 @@ +Upstream-Status: pending + +Pulled the patch from gentoo: from here: +http://sources2.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libevent/files/libevent-2.0.16-sysctl.patch?revision=1.1 + +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +2012/01/04 + +From 358c745e5432f7648b6f8b3188f32b5551cbf9d6 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Thu, 8 Dec 2011 11:39:48 -0500 +Subject: [PATCH] check for sysctl before we use it + +Not all C libraries under Linux support the sysctl() func. +--- + arc4random.c | 2 +- + configure.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arc4random.c b/arc4random.c +index 4833169..ef10fa8 100644 +--- a/arc4random.c ++++ b/arc4random.c +@@ -166,7 +166,7 @@ arc4_seed_win32(void) + } + #endif + +-#if defined(_EVENT_HAVE_SYS_SYSCTL_H) ++#if defined(_EVENT_HAVE_SYS_SYSCTL_H) && defined(_EVENT_HAVE_SYSCTL) + #if _EVENT_HAVE_DECL_CTL_KERN && _EVENT_HAVE_DECL_KERN_RANDOM && _EVENT_HAVE_DECL_RANDOM_UUID + #define TRY_SEED_SYSCTL_LINUX + static int +diff --git a/configure.in b/configure.in +index da08cf4..4e24444 100644 +--- a/configure.in ++++ b/configure.in +@@ -267,7 +267,7 @@ AC_HEADER_TIME + + dnl Checks for library functions. + AC_CHECK_FUNCS([gettimeofday vasprintf fcntl clock_gettime strtok_r strsep]) +-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]) ++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]) + + AC_CACHE_CHECK( + [for getaddrinfo], +-- +1.7.6.1 diff --git a/meta/recipes-support/libevent/libevent_2.0.16.bb b/meta/recipes-support/libevent/libevent_2.0.16.bb index 6da3d94fec..38d42f0bf6 100644 --- a/meta/recipes-support/libevent/libevent_2.0.16.bb +++ b/meta/recipes-support/libevent/libevent_2.0.16.bb @@ -7,9 +7,10 @@ SECTION = "libs" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=50aad300de703db62baae12146832b45" -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://libevent-2.0.16_fix_for_x32.patch" SRC_URI[md5sum] = "899efcffccdb3d5111419df76e7dc8df" SRC_URI[sha256sum] = "a578c7bcaf3bab1cc7924bd4d219f2ea621ab8c51dfc4f886e234b6ef4d38295" |