diff options
| author | Ross Burton <ross@openedhand.com> | 2007-03-15 10:37:25 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2007-03-15 10:37:25 +0000 |
| commit | 9daab5bbda2d1d0a10c6582563d3cb059076594f (patch) | |
| tree | af36f410063e0133d6495a72b21cc0236868c296 /meta | |
| parent | ffe0e46157774a5ff6289e6dbaa0ed6c479a26e4 (diff) | |
| download | openembedded-core-9daab5bbda2d1d0a10c6582563d3cb059076594f.tar.gz openembedded-core-9daab5bbda2d1d0a10c6582563d3cb059076594f.tar.bz2 openembedded-core-9daab5bbda2d1d0a10c6582563d3cb059076594f.tar.xz openembedded-core-9daab5bbda2d1d0a10c6582563d3cb059076594f.zip | |
Remove a chunk of the no-iconv patch, this can be fetched from the config cache
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1347 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/eds/eds-dbus/no_iconv_test.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/packages/eds/eds-dbus/no_iconv_test.patch b/meta/packages/eds/eds-dbus/no_iconv_test.patch index 6e33c7889..4a034b6c5 100644 --- a/meta/packages/eds/eds-dbus/no_iconv_test.patch +++ b/meta/packages/eds/eds-dbus/no_iconv_test.patch @@ -2,46 +2,6 @@ Index: trunk/configure.in =================================================================== --- trunk.orig/configure.in 2005-09-28 17:34:08.000000000 +0000 +++ trunk/configure.in 2005-09-28 19:13:22.000000000 +0000 -@@ -213,39 +213,6 @@ - if test $ac_cv_libiconv = no; then - AC_CHECK_FUNCS(gnu_get_libc_version) - fi -- AC_CACHE_CHECK([if iconv() handles UTF-8], ac_cv_libiconv_utf8, AC_TRY_RUN([ --#include <iconv.h> --#include <stdlib.h> --#include <string.h> --#ifdef HAVE_GNU_GET_LIBC_VERSION --#include <gnu/libc-version.h> --#endif -- --int main (int argc, char **argv) --{ -- const char *from = "Some Text \xA4"; -- const char *utf8 = "Some Text \xC2\xA4"; -- char *transbuf = malloc (20), *trans = transbuf; -- iconv_t cd; -- size_t from_len = strlen (from), utf8_len = 20; -- size_t utf8_real_len = strlen (utf8); -- --#ifdef HAVE_GNU_GET_LIBC_VERSION -- /* glibc 2.1.2's iconv is broken in hard to test ways. */ -- if (!strcmp (gnu_get_libc_version (), "2.1.2")) -- exit (1); --#endif -- -- cd = iconv_open ("UTF-8", "ISO_8859-1"); -- if (cd == (iconv_t) -1) -- exit (1); -- if (iconv (cd, &from, &from_len, &trans, &utf8_len) == -1 || from_len != 0) -- exit (1); -- if (memcmp (utf8, transbuf, utf8_real_len) != 0) -- exit (1); -- -- exit (0); --}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv_libiconv_utf8=no; have_iconv=no])) - fi - - if test "$have_iconv" = no; then @@ -254,25 +221,6 @@ AC_SUBST(ICONV_CFLAGS) AC_SUBST(ICONV_LIBS) |