diff options
author | Mike Frysinger <vapier@gentoo.org> | 2012-08-18 03:11:09 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2012-08-18 03:11:09 +0000 |
commit | 6bbf0c8206bfe219f5e9ebd52a5090587611e4ac (patch) | |
tree | 0d2926253236cf4f2c9d992818b394d232db12e9 /dev-libs | |
parent | Add fix from upstream for building with glibc-2.16 #426254 by devsk. (diff) | |
download | gentoo-2-6bbf0c8206bfe219f5e9ebd52a5090587611e4ac.tar.gz gentoo-2-6bbf0c8206bfe219f5e9ebd52a5090587611e4ac.tar.bz2 gentoo-2-6bbf0c8206bfe219f5e9ebd52a5090587611e4ac.zip |
Add fix from upstream for building with glibc-2.16 #426812 by Diego Elio Pettenò.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/ecore/ChangeLog | 8 | ||||
-rw-r--r-- | dev-libs/ecore/ecore-1.2.1.ebuild | 8 | ||||
-rw-r--r-- | dev-libs/ecore/files/ecore-1.2.1-glibc-2.16.patch | 37 |
3 files changed, 49 insertions, 4 deletions
diff --git a/dev-libs/ecore/ChangeLog b/dev-libs/ecore/ChangeLog index c628baf81fa2..cf13dd23b9aa 100644 --- a/dev-libs/ecore/ChangeLog +++ b/dev-libs/ecore/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/ecore # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ChangeLog,v 1.7 2012/06/17 12:54:10 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ChangeLog,v 1.8 2012/08/18 03:11:09 vapier Exp $ + + 18 Aug 2012; Mike Frysinger <vapier@gentoo.org> + +files/ecore-1.2.1-glibc-2.16.patch, ecore-1.2.1.ebuild: + Add fix from upstream for building with glibc-2.16 #426812 by Diego Elio + Pettenò. *ecore-1.2.1 (17 Jun 2012) @@ -40,4 +45,3 @@ 18 Nov 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> +ecore-1.0.0_beta2.ebuild, +metadata.xml: Initial commit, based on ebuild in enlightenment overlay - diff --git a/dev-libs/ecore/ecore-1.2.1.ebuild b/dev-libs/ecore/ecore-1.2.1.ebuild index fa14648e8efa..e415994bd92a 100644 --- a/dev-libs/ecore/ecore-1.2.1.ebuild +++ b/dev-libs/ecore/ecore-1.2.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ecore-1.2.1.ebuild,v 1.1 2012/06/17 12:54:11 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ecore-1.2.1.ebuild,v 1.2 2012/08/18 03:11:09 vapier Exp $ EAPI=2 -inherit virtualx enlightenment +inherit virtualx enlightenment eutils DESCRIPTION="Enlightenment's core event abstraction layer and OS abstraction layer" SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2" @@ -45,6 +45,10 @@ DEPEND="${RDEPEND}" #tests depend on temp data from eina WORKDIR RESTRICT=test +src_prepare() { + epatch "${FILESDIR}"/${P}-glibc-2.16.patch #426812 +} + src_configure() { local SSL_FLAGS="" EVAS_FLAGS="" X_FLAGS="" diff --git a/dev-libs/ecore/files/ecore-1.2.1-glibc-2.16.patch b/dev-libs/ecore/files/ecore-1.2.1-glibc-2.16.patch new file mode 100644 index 000000000000..2cb886cf3393 --- /dev/null +++ b/dev-libs/ecore/files/ecore-1.2.1-glibc-2.16.patch @@ -0,0 +1,37 @@ +------------------------------------------------------------------------ +r72684 | caro | 2012-06-22 01:36:00 -0400 (Fri, 22 Jun 2012) | 8 lines + +ecore_exe: fix compilation on fedora 18. + +setpriority needs sys/resource.h. See: + +http://linux.die.net/man/2/setpriority + +I let sys/time.h, it does not hurt on linux and is anyway needed for BSD systems. + + +Index: src/lib/ecore/ecore_exe.c +=================================================================== +--- src/lib/ecore/ecore_exe.c (revision 72683) ++++ src/lib/ecore/ecore_exe.c (revision 72684) +@@ -2,11 +2,6 @@ + # include <config.h> + #endif + +-#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) +-# include <sys/time.h> +-# include <sys/resource.h> +-#endif +- + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +@@ -14,6 +9,8 @@ + #include <sys/types.h> + #include <unistd.h> + #include <fcntl.h> ++#include <sys/time.h> ++#include <sys/resource.h> + + #ifdef HAVE_SYS_PRCTL_H + # include <sys/prctl.h> |