diff options
| author |   Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-03-12 13:06:33 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-03-15 08:45:51 +0100 |
| commit | cf0c047a2b6cc747244a31c0a79d5bbb51465708 (patch) | |
| tree | 6b376c55f289c127fe788e6ab85965cd194536a1 /recipes | |
| parent | cb84b138269ed9f3426f4e79f4bb9911e5066387 (diff) | |
| download | openembedded-cf0c047a2b6cc747244a31c0a79d5bbb51465708.tar.gz | |
gettext: fixed build with autoconf
lifted from patch from Bernhard Reutner-Fischer on oe
who found it somewhere on a mailing list
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/gettext/gettext-0.17/m4_copy.patch | 53 | ||||
| -rw-r--r-- | recipes/gettext/gettext_0.17.bb | 3 |
2 files changed, 55 insertions, 1 deletions
diff --git a/recipes/gettext/gettext-0.17/m4_copy.patch b/recipes/gettext/gettext-0.17/m4_copy.patch new file mode 100644 index 0000000000..2502221379 --- /dev/null +++ b/recipes/gettext/gettext-0.17/m4_copy.patch @@ -0,0 +1,53 @@ +@ -0,0 +1,52 @@ +Re: _AC_LANG_OPENMP and m4_copy + +Bruno Haible +Wed, 03 Dec 2008 16:33:38 -0800 + +Hello Ralf, + +Thanks for the report and fix. + +Eric Blake wrote: +> Looks fine to me, but let Bruno chime in before committing. I agree with +> your approach of fixing gnulib to avoid the problem by not competing when +> a new-enough autoconf provides the macro + +I agree with this approach. But the patch introduces the use of another +undocumented macro, namely 'm4_version_prereq'. I prefer to get away without +it, and am committing this: + + +2008-12-03 Ralf Wildenhues <[EMAIL PROTECTED]> + Bruno Haible <[EMAIL PROTECTED]> + + * m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or newer. + + +--- gettext-0.17.old/gettext-tools/gnulib-m4/openmp.m4 2007-05-27 21:50:22.000000000 +0200 ++++ gettext-0.17/gettext-tools/gnulib-m4/openmp.m4 2010-02-10 16:48:58.000000000 +0100 +@@ -1,11 +1,15 @@ +-# openmp.m4 serial 4 +-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. ++# openmp.m4 serial 5 ++dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + dnl This file can be removed once we assume autoconf >= 2.62. + ++dnl Expand to nothing in autoconf >= 2.62. m4_copy has a different ++dnl semantic in autoconf > 2.63. ++m4_ifdef([AC_OPENMP], [], [ ++ + # _AC_LANG_OPENMP + # --------------- + # Expands to some language dependent source code for testing the presence of +@@ -90,3 +94,6 @@ + fi + AC_SUBST([OPENMP_]_AC_LANG_PREFIX[FLAGS]) + ]) ++ ++]) ++ diff --git a/recipes/gettext/gettext_0.17.bb b/recipes/gettext/gettext_0.17.bb index fbb479a75e..36a99f6dc7 100644 --- a/recipes/gettext/gettext_0.17.bb +++ b/recipes/gettext/gettext_0.17.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library." HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" SECTION = "libs" LICENSE = "GPLv3" -PR = "r5" +PR = "r6" DEPENDS = "gettext-native virtual/libiconv ncurses expat" DEPENDS_virtclass-native = "libxml2-native" PROVIDES = "virtual/libintl" @@ -16,6 +16,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://wchar-uclibc.patch;patch=1 \ file://use_open_properly.patch;patch=1 \ file://gettext-autoconf-lib-link-no-L.patch;patch=1 \ + file://m4_copy.patch;patch=1 \ " SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" |