diff options
Diffstat (limited to 'meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch')
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch new file mode 100644 index 0000000000..3796052a55 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch | |||
@@ -0,0 +1,107 @@ | |||
1 | This patch updates the required version number from 2.61 to the | ||
2 | current 2.65 version of aclocal, this will need to be updated | ||
3 | when we update aclocal | ||
4 | |||
5 | Signed-off-by Saul Wold <sgw@linux.intel.com> | ||
6 | |||
7 | Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 | ||
8 | =================================================================== | ||
9 | --- gettext-0.16.1.orig/autoconf-lib-link/m4/lib-link.m4 2011-03-17 02:24:36.391519775 -0700 | ||
10 | +++ gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 2011-03-17 02:24:45.569526073 -0700 | ||
11 | @@ -148,7 +148,7 @@ | ||
12 | define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | ||
13 | [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | ||
14 | dnl Autoconf >= 2.61 supports dots in --with options. | ||
15 | - define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) | ||
16 | + define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.65]),[-1],[translit([$1],[.],[_])],[$1])]) | ||
17 | dnl By default, look in $includedir and $libdir. | ||
18 | use_additional=yes | ||
19 | AC_LIB_WITH_FINAL_PREFIX([ | ||
20 | Index: gettext-0.16.1/autoconf-lib-link/tests/rpathly/aclocal.m4 | ||
21 | =================================================================== | ||
22 | --- gettext-0.16.1.orig/autoconf-lib-link/tests/rpathly/aclocal.m4 2011-03-17 02:24:36.391519775 -0700 | ||
23 | +++ gettext-0.16.1/autoconf-lib-link/tests/rpathly/aclocal.m4 2011-03-17 02:24:45.570526904 -0700 | ||
24 | @@ -11,8 +11,8 @@ | ||
25 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
26 | # PARTICULAR PURPOSE. | ||
27 | |||
28 | -m4_if(m4_PACKAGE_VERSION, [2.61],, | ||
29 | -[m4_fatal([this file was generated for autoconf 2.61. | ||
30 | +m4_if(m4_PACKAGE_VERSION, [2.65],, | ||
31 | +[m4_fatal([this file was generated for autoconf 2.65. | ||
32 | You have another version of autoconf. If you want to use that, | ||
33 | you should regenerate the build system entirely.], [63])]) | ||
34 | |||
35 | Index: gettext-0.16.1/autoconf-lib-link/tests/rpathx/aclocal.m4 | ||
36 | =================================================================== | ||
37 | --- gettext-0.16.1.orig/autoconf-lib-link/tests/rpathx/aclocal.m4 2011-03-17 02:24:36.391519775 -0700 | ||
38 | +++ gettext-0.16.1/autoconf-lib-link/tests/rpathx/aclocal.m4 2011-03-17 02:24:45.572525773 -0700 | ||
39 | @@ -11,8 +11,8 @@ | ||
40 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
41 | # PARTICULAR PURPOSE. | ||
42 | |||
43 | -m4_if(m4_PACKAGE_VERSION, [2.61],, | ||
44 | -[m4_fatal([this file was generated for autoconf 2.61. | ||
45 | +m4_if(m4_PACKAGE_VERSION, [2.65],, | ||
46 | +[m4_fatal([this file was generated for autoconf 2.65. | ||
47 | You have another version of autoconf. If you want to use that, | ||
48 | you should regenerate the build system entirely.], [63])]) | ||
49 | |||
50 | Index: gettext-0.16.1/autoconf-lib-link/tests/rpathy/aclocal.m4 | ||
51 | =================================================================== | ||
52 | --- gettext-0.16.1.orig/autoconf-lib-link/tests/rpathy/aclocal.m4 2011-03-17 02:24:36.391519775 -0700 | ||
53 | +++ gettext-0.16.1/autoconf-lib-link/tests/rpathy/aclocal.m4 2011-03-17 02:24:45.578394916 -0700 | ||
54 | @@ -11,7 +11,7 @@ | ||
55 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
56 | # PARTICULAR PURPOSE. | ||
57 | |||
58 | -m4_if(m4_PACKAGE_VERSION, [2.61],, | ||
59 | +m4_if(m4_PACKAGE_VERSION, [2.65],, | ||
60 | [m4_fatal([this file was generated for autoconf 2.61. | ||
61 | You have another version of autoconf. If you want to use that, | ||
62 | you should regenerate the build system entirely.], [63])]) | ||
63 | Index: gettext-0.16.1/autoconf-lib-link/tests/rpathz/aclocal.m4 | ||
64 | =================================================================== | ||
65 | --- gettext-0.16.1.orig/autoconf-lib-link/tests/rpathz/aclocal.m4 2011-03-17 02:24:36.391519775 -0700 | ||
66 | +++ gettext-0.16.1/autoconf-lib-link/tests/rpathz/aclocal.m4 2011-03-17 02:24:45.586395416 -0700 | ||
67 | @@ -11,8 +11,8 @@ | ||
68 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
69 | # PARTICULAR PURPOSE. | ||
70 | |||
71 | -m4_if(m4_PACKAGE_VERSION, [2.61],, | ||
72 | -[m4_fatal([this file was generated for autoconf 2.61. | ||
73 | +m4_if(m4_PACKAGE_VERSION, [2.65],, | ||
74 | +[m4_fatal([this file was generated for autoconf 2.65. | ||
75 | You have another version of autoconf. If you want to use that, | ||
76 | you should regenerate the build system entirely.], [63])]) | ||
77 | |||
78 | Index: gettext-0.16.1/gettext-tools/aclocal.m4 | ||
79 | =================================================================== | ||
80 | --- gettext-0.16.1.orig/gettext-tools/aclocal.m4 2006-11-27 09:34:32.000000000 -0800 | ||
81 | +++ gettext-0.16.1/gettext-tools/aclocal.m4 2011-03-17 02:27:01.135682807 -0700 | ||
82 | @@ -11,8 +11,8 @@ | ||
83 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
84 | # PARTICULAR PURPOSE. | ||
85 | |||
86 | -m4_if(m4_PACKAGE_VERSION, [2.61],, | ||
87 | -[m4_fatal([this file was generated for autoconf 2.61. | ||
88 | +m4_if(m4_PACKAGE_VERSION, [2.65],, | ||
89 | +[m4_fatal([this file was generated for autoconf 2.65. | ||
90 | You have another version of autoconf. If you want to use that, | ||
91 | you should regenerate the build system entirely.], [63])]) | ||
92 | |||
93 | Index: gettext-0.16.1/gettext-tools/examples/aclocal.m4 | ||
94 | =================================================================== | ||
95 | --- gettext-0.16.1.orig/gettext-tools/examples/aclocal.m4 2006-11-27 09:16:23.000000000 -0800 | ||
96 | +++ gettext-0.16.1/gettext-tools/examples/aclocal.m4 2011-03-17 02:26:52.589396683 -0700 | ||
97 | @@ -11,8 +11,8 @@ | ||
98 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
99 | # PARTICULAR PURPOSE. | ||
100 | |||
101 | -m4_if(m4_PACKAGE_VERSION, [2.61],, | ||
102 | -[m4_fatal([this file was generated for autoconf 2.61. | ||
103 | +m4_if(m4_PACKAGE_VERSION, [2.65],, | ||
104 | +[m4_fatal([this file was generated for autoconf 2.65. | ||
105 | You have another version of autoconf. If you want to use that, | ||
106 | you should regenerate the build system entirely.], [63])]) | ||
107 | |||