diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-12-08 19:05:26 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-12-08 19:05:26 +0000 |
commit | 29a113c5aceb8bf15ffe5d7d3d570a4d245368fd (patch) | |
tree | 53d9c0f7dbd618b59c7bf8373ee51aa701b2375f /dev-libs/libevent | |
parent | Missing gtk-engines-unico runtime depend. (diff) | |
download | historical-29a113c5aceb8bf15ffe5d7d3d570a4d245368fd.tar.gz historical-29a113c5aceb8bf15ffe5d7d3d570a4d245368fd.tar.bz2 historical-29a113c5aceb8bf15ffe5d7d3d570a4d245368fd.zip |
Add fix from upstream for building on systems that lack sysctl() but have sysctl.h (like x32 ABI).
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/libevent')
-rw-r--r-- | dev-libs/libevent/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/libevent/Manifest | 15 | ||||
-rw-r--r-- | dev-libs/libevent/files/libevent-2.0.16-sysctl.patch | 40 | ||||
-rw-r--r-- | dev-libs/libevent/libevent-2.0.16.ebuild | 15 |
4 files changed, 64 insertions, 13 deletions
diff --git a/dev-libs/libevent/ChangeLog b/dev-libs/libevent/ChangeLog index 4b02092d5de9..d6a87dca6665 100644 --- a/dev-libs/libevent/ChangeLog +++ b/dev-libs/libevent/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libevent # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/ChangeLog,v 1.200 2011/11/27 22:14:57 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/ChangeLog,v 1.201 2011/12/08 19:05:26 vapier Exp $ + + 08 Dec 2011; Mike Frysinger <vapier@gentoo.org> libevent-2.0.16.ebuild, + +files/libevent-2.0.16-sysctl.patch: + Add fix from upstream for building on systems that lack sysctl() but have + sysctl.h (like x32 ABI). 27 Nov 2011; Jeroen Roovers <jer@gentoo.org> libevent-2.0.12.ebuild, -libevent-2.0.13.ebuild, libevent-2.0.14.ebuild, libevent-2.0.15.ebuild, diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest index 8cafa822458f..3bfc4c641ad8 100644 --- a/dev-libs/libevent/Manifest +++ b/dev-libs/libevent/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 +AUX libevent-2.0.16-sysctl.patch 1536 RMD160 0c4ef1ed3b3700c6dc657479dd8487fc5189e61b SHA1 d65a7059694ca98dce955fac7606599b91068678 SHA256 e5d07c450b6d354f0a4a4821e4f649ebeeb1a4c604540ed24c1a12eb06945778 DIST libevent-1.4.13-stable.tar.gz 499603 RMD160 b363aee80f73f27a68516d57c00592fe923aa40a SHA1 b0c4e9801b74f8bed1502353674288a5e4f1ca16 SHA256 d6fff1d7e7b79e6e083b482b0b55190f71ba597b55c3541d64c0572ddf0747a3 DIST libevent-1.4.14b-stable.tar.gz 474874 RMD160 5eb739f0ae812e81ca2e196fbed849529cfbc689 SHA1 4a834364c28ad652ddeb00b5f83872506eede7d4 SHA256 afa61b476a222ba43fc7cca2d24849ab0bbd940124400cb699915d3c60e46301 DIST libevent-2.0.12-stable.tar.gz 822416 RMD160 c630fcc739e14b526c2ac37aec004f19c9bf9efc SHA1 fa2e1643101a8f8eba8e6fcffdce97cb9309c1d2 SHA256 ac0283f72e0f881e93ac3ae9497a20c78bd075c6c12506ad10e821aa1c29e5ab @@ -13,13 +14,13 @@ EBUILD libevent-1.4.14b.ebuild 1219 RMD160 e3ef65429604ea3867fcb68b5cb3d5abe086d EBUILD libevent-2.0.12.ebuild 1248 RMD160 719881a3b754a928e950c0c688ed500b61e091bf SHA1 1c065a2b1c97698cb138330c687f672584ebb0d1 SHA256 f008bb68d2b8b6d1161892700399ccbc22330f8206d411312b54446b95b094a4 EBUILD libevent-2.0.14.ebuild 1265 RMD160 07eb3600d81364f395217866e92c0047ac4df1fb SHA1 8e77727036d9bf22d74007cf6fa2b5a46fa18f2c SHA256 be50d8f2fe52b71d73302be5849b3bdebab5ea8d118ae527fa560d9556ddfde8 EBUILD libevent-2.0.15.ebuild 1346 RMD160 58bfe1050c9ef10c9ddc797ecf2b6de663ae7d47 SHA1 47b0f6fb9c03d3a5b9ad7efd3bcc56a592bb4cba SHA256 bc3f8fa34581968490ac439dcf18176f0c35cf57a30014ba8e12293ef19a4391 -EBUILD libevent-2.0.16.ebuild 1346 RMD160 521cad9b36466d6ecaeac5329bc020190c5e5053 SHA1 a8fda88f0406cff9d1abaf3167ea10c362c32344 SHA256 2ec43ef7fe008a7ac5904be10951add686e944a5bdfe35d5d72c140258b8f5da -MISC ChangeLog 23775 RMD160 c78f4ec92e087687ce83a0b6f6d8a0f315b353ca SHA1 dd0d5249a6983aea6d95241a155dbb263cd83de0 SHA256 fce76ec49ae8d2945696cbe13c23d951acb1d9e2675d484e3c9c5f5cbc36b4e2 +EBUILD libevent-2.0.16.ebuild 1505 RMD160 5f447357027a24aa5bf1c8eb9099185482bafa19 SHA1 757099fe4d0810aeb25cbadf79128041ef55e7f4 SHA256 2beb9c7f6a60c7100ccfe9a700bbd227da47f9a9d8c7c4b612d9080bef91fea4 +MISC ChangeLog 23995 RMD160 d7e53d20bd506aaeb95466a6f79c105ff8769657 SHA1 07f7956b417e23f03eb7b9bc0bbf38ab74d47222 SHA256 cb4858d47ddfa182d45181c31464a3dfb206a0097f5b30dbe13185663c85d8ab MISC metadata.xml 230 RMD160 f4eaafe69d80938604be6213ca2529b73ced7a53 SHA1 27d0d9e737236700ad6d266c9a2fc8869f427869 SHA256 529c3320b250d179bb9e9ae651a88ba3f2a1bca78cd1ab07d5aef28d571960ce -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7Stm4ACgkQVWmRsqeSphMwXwCffxueVDDOWOH3MysRtIUmgj/U -zNcAn0Gw5/AKtR8TM2U3I1TmzvWztPdg -=GtYc +iF4EAREIAAYFAk7hCoQACgkQaC/OocHi7JYjhwEAmlXMiXSEk95mngn0jHIWeG0H +L8yhk/sTs+OsfYJPDi0A/2dgPor5DfQx9ADlKuB4ggWUfKO31RFe/U1bl4bMTh7n +=ve/r -----END PGP SIGNATURE----- diff --git a/dev-libs/libevent/files/libevent-2.0.16-sysctl.patch b/dev-libs/libevent/files/libevent-2.0.16-sysctl.patch new file mode 100644 index 000000000000..49abeb18f40a --- /dev/null +++ b/dev-libs/libevent/files/libevent-2.0.16-sysctl.patch @@ -0,0 +1,40 @@ +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/dev-libs/libevent/libevent-2.0.16.ebuild b/dev-libs/libevent/libevent-2.0.16.ebuild index 1686dd9cc8a5..72173214f4ae 100644 --- a/dev-libs/libevent/libevent-2.0.16.ebuild +++ b/dev-libs/libevent/libevent-2.0.16.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.0.16.ebuild,v 1.2 2011/11/27 22:14:57 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.0.16.ebuild,v 1.3 2011/12/08 19:05:26 vapier Exp $ EAPI="2" -inherit libtool +inherit eutils autotools MY_P="${P}-stable" @@ -26,16 +26,21 @@ RDEPEND=" S=${WORKDIR}/${MY_P} src_prepare() { + # Once we updated to 2.0.17, this can be dropped, and we + # can move back to calling just `elibtoolize`. + epatch "${FILESDIR}"/${P}-sysctl.patch + eautoreconf + # don't waste time building tests/samples sed -i \ -e 's|^\(SUBDIRS =.*\)sample test\(.*\)$|\1\2|' \ Makefile.in || die "sed Makefile.in failed" - - elibtoolize } src_configure() { - econf $(use_enable static-libs static) $(use_enable ssl openssl) || die + econf \ + $(use_enable static-libs static) \ + $(use_enable ssl openssl) } src_test() { |