aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-03-11 09:45:17 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-03-11 11:42:22 +0100
commit1a037cc05da35944994498b99583314c7e3c706b (patch)
tree2801bc4a8feaf9172e64ecb1d9a931b077bc5145
parent931d7ef4f056db5b1317b90e62fd7eed439608d4 (diff)
downloadopenembedded-1a037cc05da35944994498b99583314c7e3c706b.tar.gz
openembedded-1a037cc05da35944994498b99583314c7e3c706b.tar.bz2
openembedded-1a037cc05da35944994498b99583314c7e3c706b.zip
ecore: split exit_uclibc patch, as one part needs maxrev=47076
* ecore_con_dns.c was removed in r47077 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/efl1/ecore/exit_uclibc.patch13
-rw-r--r--recipes/efl1/ecore/exit_uclibc_dns.patch13
-rw-r--r--recipes/efl1/ecore_svn.bb1
3 files changed, 14 insertions, 13 deletions
diff --git a/recipes/efl1/ecore/exit_uclibc.patch b/recipes/efl1/ecore/exit_uclibc.patch
index dea010c116..105aeedcb1 100644
--- a/recipes/efl1/ecore/exit_uclibc.patch
+++ b/recipes/efl1/ecore/exit_uclibc.patch
@@ -1,16 +1,3 @@
-Index: ecore/src/lib/ecore_con/ecore_con_dns.c
-===================================================================
---- ecore.orig/src/lib/ecore_con/ecore_con_dns.c 2009-11-14 00:12:04.279051754 +0100
-+++ ecore/src/lib/ecore_con/ecore_con_dns.c 2009-11-14 00:14:41.685708230 +0100
-@@ -135,7 +135,7 @@
- write(fd[1], "", 1);
- }
- close(fd[1]);
--# ifdef __USE_ISOC99
-+# if defined(__USE_ISOC99) && !defined(__UCLIBC__)
- _Exit(0);
- # else
- _exit(0);
Index: ecore/src/lib/ecore_con/ecore_con_info.c
===================================================================
--- ecore.orig/src/lib/ecore_con/ecore_con_info.c 2009-11-14 00:14:56.056955719 +0100
diff --git a/recipes/efl1/ecore/exit_uclibc_dns.patch b/recipes/efl1/ecore/exit_uclibc_dns.patch
new file mode 100644
index 0000000000..0be2d3d6c0
--- /dev/null
+++ b/recipes/efl1/ecore/exit_uclibc_dns.patch
@@ -0,0 +1,13 @@
+Index: ecore/src/lib/ecore_con/ecore_con_dns.c
+===================================================================
+--- ecore.orig/src/lib/ecore_con/ecore_con_dns.c 2009-11-14 00:12:04.279051754 +0100
++++ ecore/src/lib/ecore_con/ecore_con_dns.c 2009-11-14 00:14:41.685708230 +0100
+@@ -135,7 +135,7 @@
+ write(fd[1], "", 1);
+ }
+ close(fd[1]);
+-# ifdef __USE_ISOC99
++# if defined(__USE_ISOC99) && !defined(__UCLIBC__)
+ _Exit(0);
+ # else
+ _exit(0);
diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb
index 178e9e95f3..2354673eb3 100644
--- a/recipes/efl1/ecore_svn.bb
+++ b/recipes/efl1/ecore_svn.bb
@@ -2,6 +2,7 @@ require ecore.inc
PR = "r7"
SRC_URI += "file://iconv.patch;patch=1;maxrev=43996 \
+ file://exit_uclibc_dns.patch;patch=1;maxrev=47076 \
file://exit_uclibc.patch;patch=1 \
"