summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch')
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
deleted file mode 100644
index 34930d1539..0000000000
--- a/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
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
25Upstream-Status: Pending
26
27Index: gettext-0.17/gettext-tools/gnulib-m4/openmp.m4
28===================================================================
29--- gettext-0.17.orig/gettext-tools/gnulib-m4/openmp.m4 2010-02-01 10:51:00.437788710 +0000
30+++ gettext-0.17/gettext-tools/gnulib-m4/openmp.m4 2010-02-01 10:51:50.697789220 +0000
31@@ -1,11 +1,13 @@
32-# openmp.m4 serial 4
33-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
34+# openmp.m4 serial 5
35+dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
36 dnl This file is free software; the Free Software Foundation
37 dnl gives unlimited permission to copy and/or distribute it,
38 dnl with or without modifications, as long as this notice is preserved.
39
40 dnl This file can be removed once we assume autoconf >= 2.62.
41
42+m4_version_prereq([2.62],, [
43+
44 # _AC_LANG_OPENMP
45 # ---------------
46 # Expands to some language dependent source code for testing the presence of
47@@ -90,3 +92,5 @@
48 fi
49 AC_SUBST([OPENMP_]_AC_LANG_PREFIX[FLAGS])
50 ])
51+
52+])