diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2012-07-07 08:48:07 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-07-09 15:35:10 +0200 |
commit | ce62a6e815a545ef88fd841ac7607167d6c19afe (patch) | |
tree | 56ff6935810d36658091c760bdc5f02385e78ebc | |
parent | 943c18cb5bc9df501ea4cb0c2bb368977b676151 (diff) | |
download | meta-openembedded-ce62a6e815a545ef88fd841ac7607167d6c19afe.tar.gz |
ecore: backport patch from trunk to fix build with eglibc-2.16
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r-- | meta-efl/recipes-efl/efl/ecore/0001-ecore_exe-fix-compilation-on-fedora-18.patch | 45 | ||||
-rw-r--r-- | meta-efl/recipes-efl/efl/ecore_1.2.1.bb | 3 |
2 files changed, 47 insertions, 1 deletions
diff --git a/meta-efl/recipes-efl/efl/ecore/0001-ecore_exe-fix-compilation-on-fedora-18.patch b/meta-efl/recipes-efl/efl/ecore/0001-ecore_exe-fix-compilation-on-fedora-18.patch new file mode 100644 index 000000000..613cf5e47 --- /dev/null +++ b/meta-efl/recipes-efl/efl/ecore/0001-ecore_exe-fix-compilation-on-fedora-18.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 2ad957d5da1fc91faf7c2c6562139d19f29f5b9c Mon Sep 17 00:00:00 2001 | ||
2 | From: caro <caro@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33> | ||
3 | Date: Fri, 22 Jun 2012 05:36:00 +0000 | ||
4 | Subject: [PATCH] ecore_exe: fix compilation on fedora 18. | ||
5 | |||
6 | setpriority needs sys/resource.h. See: | ||
7 | |||
8 | http://linux.die.net/man/2/setpriority | ||
9 | |||
10 | I let sys/time.h, it does not hurt on linux and is anyway needed for BSD systems. | ||
11 | |||
12 | |||
13 | git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk@72684 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 | ||
14 | --- | ||
15 | src/lib/ecore/ecore_exe.c | 7 ++----- | ||
16 | 2 files changed, 6 insertions(+), 5 deletions(-) | ||
17 | |||
18 | diff --git a/src/lib/ecore/ecore_exe.c b/src/lib/ecore/ecore_exe.c | ||
19 | index 7931a96..6db32a9 100644 | ||
20 | --- a/src/lib/ecore/ecore_exe.c | ||
21 | +++ b/src/lib/ecore/ecore_exe.c | ||
22 | @@ -2,11 +2,6 @@ | ||
23 | # include <config.h> | ||
24 | #endif | ||
25 | |||
26 | -#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) | ||
27 | -# include <sys/time.h> | ||
28 | -# include <sys/resource.h> | ||
29 | -#endif | ||
30 | - | ||
31 | #include <stdlib.h> | ||
32 | #include <stdio.h> | ||
33 | #include <string.h> | ||
34 | @@ -14,6 +9,8 @@ | ||
35 | #include <sys/types.h> | ||
36 | #include <unistd.h> | ||
37 | #include <fcntl.h> | ||
38 | +#include <sys/time.h> | ||
39 | +#include <sys/resource.h> | ||
40 | |||
41 | #ifdef HAVE_SYS_PRCTL_H | ||
42 | # include <sys/prctl.h> | ||
43 | -- | ||
44 | 1.7.8.6 | ||
45 | |||
diff --git a/meta-efl/recipes-efl/efl/ecore_1.2.1.bb b/meta-efl/recipes-efl/efl/ecore_1.2.1.bb index 067042d1e..bec47a7e6 100644 --- a/meta-efl/recipes-efl/efl/ecore_1.2.1.bb +++ b/meta-efl/recipes-efl/efl/ecore_1.2.1.bb | |||
@@ -1,10 +1,11 @@ | |||
1 | require ${BPN}.inc | 1 | require ${BPN}.inc |
2 | 2 | ||
3 | PR = "${INC_PR}.0" | 3 | PR = "${INC_PR}.1" |
4 | 4 | ||
5 | SRC_URI = "\ | 5 | SRC_URI = "\ |
6 | ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ | 6 | ${E_MIRROR}/${SRCNAME}-${PV}.tar.gz \ |
7 | file://fix-ecore-fb-initialization.patch \ | 7 | file://fix-ecore-fb-initialization.patch \ |
8 | file://0001-ecore_exe-fix-compilation-on-fedora-18.patch \ | ||
8 | " | 9 | " |
9 | 10 | ||
10 | SRC_URI[md5sum] = "557f8411d323b14ed7bf1be368ab302a" | 11 | SRC_URI[md5sum] = "557f8411d323b14ed7bf1be368ab302a" |