summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2013-12-20 19:57:20 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2013-12-20 19:57:20 +0000
commit4eca66036f43aa3ca0bbe18f0711ad2603d00fe5 (patch)
tree313b33659d61de8790d9c66bcb01084f8bf16bf9 /dev-libs/libev
parentStable for amd64 wrt bug #492044 (diff)
downloadgentoo-2-4eca66036f43aa3ca0bbe18f0711ad2603d00fe5.tar.gz
gentoo-2-4eca66036f43aa3ca0bbe18f0711ad2603d00fe5.tar.bz2
gentoo-2-4eca66036f43aa3ca0bbe18f0711ad2603d00fe5.zip
Add patch to fix building with automake-1.14. Patch by Dennis 'dlan' Lan <dennis.yxun@gmail.com>. Bug #493050
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)
Diffstat (limited to 'dev-libs/libev')
-rw-r--r--dev-libs/libev/ChangeLog7
-rw-r--r--dev-libs/libev/files/libev-4.15-automake-1.14.patch21
-rw-r--r--dev-libs/libev/libev-4.15.ebuild5
3 files changed, 31 insertions, 2 deletions
diff --git a/dev-libs/libev/ChangeLog b/dev-libs/libev/ChangeLog
index 6a14da086d32..074b1a3e527f 100644
--- a/dev-libs/libev/ChangeLog
+++ b/dev-libs/libev/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/libev
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/ChangeLog,v 1.62 2013/09/26 17:29:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/ChangeLog,v 1.63 2013/12/20 19:57:20 hwoarang Exp $
+
+ 20 Dec 2013; Markos Chandras <hwoarang@gentoo.org>
+ +files/libev-4.15-automake-1.14.patch, libev-4.15.ebuild:
+ Add patch to fix building with automake-1.14. Patch by Dennis 'dlan' Lan
+ <dennis.yxun@gmail.com>. Bug #493050
26 Sep 2013; Agostino Sarubbo <ago@gentoo.org> libev-4.15.ebuild:
Stable for arm, wrt bug #483658
diff --git a/dev-libs/libev/files/libev-4.15-automake-1.14.patch b/dev-libs/libev/files/libev-4.15-automake-1.14.patch
new file mode 100644
index 000000000000..22fcc1a0093f
--- /dev/null
+++ b/dev-libs/libev/files/libev-4.15-automake-1.14.patch
@@ -0,0 +1,21 @@
+Gentoo bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=493050
+Patch-by: Dennis 'dlan' Lan <dennis.yxun@gmail.com>
+
+diff --git a/configure.ac b/configure.ac
+index 7ea3ec8..290fce0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,11 +1,12 @@
+ AC_INIT
+
++AM_INIT_AUTOMAKE(libev,4.15) dnl also update ev.h!
++
+ orig_CFLAGS="$CFLAGS"
+
+ AC_CONFIG_SRCDIR([ev_epoll.c])
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE(libev,4.15) dnl also update ev.h!
+ AC_CONFIG_HEADERS([config.h])
+ AM_MAINTAINER_MODE
+
diff --git a/dev-libs/libev/libev-4.15.ebuild b/dev-libs/libev/libev-4.15.ebuild
index 6ebc011a133e..0d2d362aebde 100644
--- a/dev-libs/libev/libev-4.15.ebuild
+++ b/dev-libs/libev/libev-4.15.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-4.15.ebuild,v 1.9 2013/09/26 17:29:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libev/libev-4.15.ebuild,v 1.10 2013/12/20 19:57:20 hwoarang Exp $
EAPI=5
@@ -27,7 +27,10 @@ src_prepare() {
# bug #411847
epatch "${FILESDIR}/${PN}-pc.patch"
+ # bug #493050
+ epatch "${FILESDIR}/${P}-automake-1.14.patch"
+ epatch_user
eautoreconf
}