ecore: fix building for uClibc

4 files changed, 76 insertions, 11 deletions

diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc
index 4cbbc01774..25603087de 100644
--- a/recipes/efl1/ecore.inc
+++ b/recipes/efl1/ecore.inc
@@ -1,6 +1,7 @@
 DESCRIPTION = "Ecore is the Enlightenment application framework library"
 LICENSE = "MIT BSD"
-DEPENDS = "curl eet evas tslib libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxprintutil"
+DEPENDS = "virtual/libiconv curl eet evas tslib \
+           libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxprintutil"
 # optional
 # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv"
 PV = "0.9.9.060+svnr${SRCPV}"
diff --git a/recipes/efl1/ecore/exit_uclibc.patch b/recipes/efl1/ecore/exit_uclibc.patch
new file mode 100644
index 0000000000..dea010c116
--- /dev/null
+++ b/recipes/efl1/ecore/exit_uclibc.patch
@@ -0,0 +1,26 @@
+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
++++ ecore/src/lib/ecore_con/ecore_con_info.c	2009-11-14 00:16:40.035696191 +0100
+@@ -243,7 +243,7 @@
+ 	  freeaddrinfo(result);
+ 	err = 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/iconv.patch b/recipes/efl1/ecore/iconv.patch
new file mode 100644
index 0000000000..bd7f20df3f
--- /dev/null
+++ b/recipes/efl1/ecore/iconv.patch
@@ -0,0 +1,35 @@
+Index: ecore/configure.ac
+===================================================================
+--- ecore.orig/configure.ac	2009-11-13 23:33:16.504742218 +0100
++++ ecore/configure.ac	2009-11-13 23:41:52.360519091 +0100
+@@ -392,6 +392,7 @@
+    ]
+ )
+ 
++if test "x${LTLIBICONV}" = "x" ; then
+ if test "x${have_iconv}" = "xno" ; then
+    AC_CHECK_LIB(c, iconv,
+       [have_iconv="yes"]   )
+@@ -413,6 +414,9 @@
+    fi
+ 
+ fi
++else 
++  have_iconv="yes"
++fi
+ AC_MSG_CHECKING(for explicit iconv link options)
+ AC_MSG_RESULT($iconv_libs)
+ 
+Index: ecore/src/lib/ecore_txt/Makefile.am
+===================================================================
+--- ecore.orig/src/lib/ecore_txt/Makefile.am	2009-11-13 23:32:49.374328084 +0100
++++ ecore/src/lib/ecore_txt/Makefile.am	2009-11-13 23:33:08.383909514 +0100
+@@ -16,7 +16,7 @@
+ libecore_txt_la_SOURCES = \
+ ecore_txt.c
+ 
+-libecore_txt_la_LIBADD = @iconv_libs@ \
++libecore_txt_la_LIBADD = @iconv_libs@ $(LTLIBICONV) \
+ @EINA_LIBS@
+ 
+ libecore_txt_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @ecore_txt_release_info@
diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb
index b9f01ba8b3..5be2dc80f1 100644
--- a/recipes/efl1/ecore_svn.bb
+++ b/recipes/efl1/ecore_svn.bb
@@ -1,32 +1,35 @@
 require ecore.inc
-PR = "r5"
+PR = "r6"
+
+SRC_URI += "file://iconv.patch;patch=1 \
+            file://exit_uclibc.patch;patch=1 \
+           "
 
 EXTRA_OECONF = "\
   --x-includes=${STAGING_INCDIR}/X11 \
   --x-libraries=${STAGING_LIBDIR} \
   --enable-simple-x11 \
-\
   --enable-ecore-txt \
   --enable-ecore-config \
-  --disable-ecore-x-xcb \
   --enable-ecore-x \
   --enable-ecore-job \
-  --disable-ecore-directfb \
-  --disable-ecore-sdl \
   --enable-ecore-fb \
   --enable-ecore-evas \
   --enable-ecore-evas-software-16-x11 \
-  --disable-ecore-evas-x11-gl \
   --enable-ecore-evas-xrender \
-  --disable-ecore-evas-dfb \
-  --disable-ecore-evas-sdl \
-  --disable-openssl \
   --enable-abstract-sockets \
   --enable-ecore-con \
   --enable-ecore-ipc \
   --enable-ecore-file \
   --enable-inotify \
-  --disable-poll \
   --enable-curl \
   --disable-ecore-desktop \
+  --disable-ecore-x-xcb \
+  --disable-ecore-directfb \
+  --disable-ecore-sdl \
+  --disable-ecore-evas-x11-gl \
+  --disable-ecore-evas-dfb \
+  --disable-ecore-evas-sdl \
+  --disable-openssl \
+  --disable-poll \
 "