summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/gettext/gettext-0.17/m4fix.patch
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-core/gettext/gettext-0.17/m4fix.patch
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/gettext/gettext-0.17/m4fix.patch')
-rw-r--r--meta/recipes-core/gettext/gettext-0.17/m4fix.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.17/m4fix.patch b/meta/recipes-core/gettext/gettext-0.17/m4fix.patch
new file mode 100644
index 0000000000..a02457fab8
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.17/m4fix.patch
@@ -0,0 +1,50 @@
1When I try to `./autogen.sh --quick' CVS gettext, using git Autoconf,
2things fall over like this (several instances):
3
4| gnulib-m4/openmp.m4:29: error: m4_copy: won't overwrite defined macro:
5_AC_LANG_OPENMP(C++)
6| gnulib-m4/openmp.m4:29: the top level
7| autom4te: /usr/bin/m4 failed with exit status: 1
8| aclocal: autom4te failed with exit status: 1
9
10I'm not quite sure whether an Autoconf bug/incompatibility is involved
11here (therefore the Cc: to bug-autoconf). m4_copy wasn't documented in
12earlier Autoconf releases, but there may still have been problematic
13semantic changes, I don't know.
14
15Anyway, the following patch seems to fix it. OK to apply?
16
17Cheers,
18Ralf
19
202008-12-03 Ralf Wildenhues <[EMAIL PROTECTED]>
21
22 * m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or
23 newer.
24
25Index: gettext-0.17/gettext-tools/gnulib-m4/openmp.m4
26===================================================================
27--- gettext-0.17.orig/gettext-tools/gnulib-m4/openmp.m4 2010-02-01 10:51:00.437788710 +0000
28+++ gettext-0.17/gettext-tools/gnulib-m4/openmp.m4 2010-02-01 10:51:50.697789220 +0000
29@@ -1,11 +1,13 @@
30-# openmp.m4 serial 4
31-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
32+# openmp.m4 serial 5
33+dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
34 dnl This file is free software; the Free Software Foundation
35 dnl gives unlimited permission to copy and/or distribute it,
36 dnl with or without modifications, as long as this notice is preserved.
37
38 dnl This file can be removed once we assume autoconf >= 2.62.
39
40+m4_version_prereq([2.62],, [
41+
42 # _AC_LANG_OPENMP
43 # ---------------
44 # Expands to some language dependent source code for testing the presence of
45@@ -90,3 +92,5 @@
46 fi
47 AC_SUBST([OPENMP_]_AC_LANG_PREFIX[FLAGS])
48 ])
49+
50+])