diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-03-19 20:56:09 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2009-03-19 20:56:09 +0100 |
| commit | 6a21d65d2840c58cfa7cd749a04669d8f7980646 (patch) | |
| tree | 00b1aa153b69cda8cf9406c4700fd7730c34d3a5 /recipes/xfce/exo | |
| parent | dcfe7349b369a87881cf1fa43085d9e9c5609fcf (diff) | |
| parent | 6f854d71c347475d53d5080a5490625345d95d12 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/xfce/exo')
| -rw-r--r-- | recipes/xfce/exo/configure.patch | 43 | ||||
| -rw-r--r-- | recipes/xfce/exo/exo-no-tests.patch | 14 |
2 files changed, 57 insertions, 0 deletions
diff --git a/recipes/xfce/exo/configure.patch b/recipes/xfce/exo/configure.patch new file mode 100644 index 0000000000..2ccfcfc994 --- /dev/null +++ b/recipes/xfce/exo/configure.patch @@ -0,0 +1,43 @@ +--- exo-0.3.4/configure.in~ 2007-12-02 10:37:06.000000000 -0200 ++++ exo-0.3.4/configure.in 2008-06-05 17:21:42.000000000 -0300 +@@ -127,22 +127,24 @@ + dnl *************************************** + dnl *** Check for strftime() extensions *** + dnl *************************************** +-AC_TRY_RUN([ +- #include <string.h> +- #include <time.h> +- int +- main (int argc, char **argv) +- { +- struct tm tm; +- char buffer[16]; +- tm.tm_year = 81; +- if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0) +- return 0; +- return 1; +- } +-], [ +- AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) +-]) ++dnl grrrr... this doesn't work for cross compiling, define it for OE ++AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) ++dnl AC_TRY_RUN([ ++dnl #include <string.h> ++dnl #include <time.h> ++dnl int ++dnl main (int argc, char **argv) ++dnl { ++dnl struct tm tm; ++dnl char buffer[16]; ++dnl tm.tm_year = 81; ++dnl if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0) ++dnl return 0; ++dnl return 1; ++dnl } ++dnl ], [ ++dnl AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) ++dnl ]) + + dnl ****************************** + dnl *** Check for i18n support *** diff --git a/recipes/xfce/exo/exo-no-tests.patch b/recipes/xfce/exo/exo-no-tests.patch new file mode 100644 index 0000000000..1cb51ab600 --- /dev/null +++ b/recipes/xfce/exo/exo-no-tests.patch @@ -0,0 +1,14 @@ +The tests/ subdir consists of stuff trying to run a generated file ('exo-csource'), which doesn't work on host systems + +--- /tmp/Makefile.am 2008-10-30 09:23:41.000000000 +0100 ++++ exo-0.3.4/Makefile.am 2008-10-30 09:24:03.011124000 +0100 +@@ -23,8 +23,7 @@ + pixmaps \ + po \ + po-doc \ +- $(PYTHON_SUBDIR) \ +- tests ++ $(PYTHON_SUBDIR) + + AUTOMAKE_OPTIONS = \ + 1.8 \ |