summaryrefslogtreecommitdiffstats
path: root/recipes-devtools
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2020-01-16 15:23:10 +0800
committerRoss Burton <ross.burton@intel.com>2020-02-03 17:44:11 +0000
commitd8d6fda1756b68f3c63dcc52f92a514568863137 (patch)
tree76aaf7d22207a719cb08410a8758eaeef3a19530 /recipes-devtools
parent55c8ced8b1bf797e7726512fe7a9d66593e7c34e (diff)
downloadmeta-gplv2-d8d6fda1756b68f3c63dcc52f92a514568863137.tar.gz
bison: fix builds with gettext 0.20.x
Fix configure error like: error: possibly undefined macro: gl_AC_HEADER_STDINT_H Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'recipes-devtools')
-rw-r--r--recipes-devtools/bison/bison/bison-2.3_m4.patch121
1 files changed, 61 insertions, 60 deletions
diff --git a/recipes-devtools/bison/bison/bison-2.3_m4.patch b/recipes-devtools/bison/bison/bison-2.3_m4.patch
index 348ce1d..626bc42 100644
--- a/recipes-devtools/bison/bison/bison-2.3_m4.patch
+++ b/recipes-devtools/bison/bison/bison-2.3_m4.patch
@@ -76,34 +76,35 @@ Upstream-Status: Pending
76+]) 76+])
77--- /dev/null 77--- /dev/null
78+++ bison-1.875/m4/uintmax_t.m4 78+++ bison-1.875/m4/uintmax_t.m4
79@@ -0,0 +1,29 @@ 79@@ -0,0 +1,30 @@
80+# uintmax_t.m4 serial 6 (gettext-0.11) 80+# uintmax_t.m4 serial 12 (gettext-0.20.1)
81+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. 81+dnl Copyright (C) 1997-2004, 2007-2019 Free Software Foundation, Inc.
82+dnl This file is free software, distributed under the terms of the GNU 82+dnl This file is free software; the Free Software Foundation
83+dnl General Public License. As a special exception to the GNU General 83+dnl gives unlimited permission to copy and/or distribute it,
84+dnl Public License, this file may be distributed as part of a program 84+dnl with or without modifications, as long as this notice is preserved.
85+dnl that contains a configuration script generated by Autoconf, under
86+dnl the same distribution terms as the rest of that program.
87+ 85+
88+dnl From Paul Eggert. 86+dnl From Paul Eggert.
89+ 87+
90+AC_PREREQ(2.13) 88+AC_PREREQ([2.13])
91+ 89+
92+# Define uintmax_t to `unsigned long' or `unsigned long long' 90+# Define uintmax_t to 'unsigned long' or 'unsigned long long'
93+# if <inttypes.h> does not exist. 91+# if it is not already defined in <stdint.h> or <inttypes.h>.
94+ 92+
95+AC_DEFUN([jm_AC_TYPE_UINTMAX_T], 93+AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
96+[ 94+[
97+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) 95+ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
98+ AC_REQUIRE([jm_AC_HEADER_STDINT_H]) 96+ AC_REQUIRE([gl_AC_HEADER_STDINT_H])
99+ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then 97+ if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
100+ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) 98+ AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
101+ test $ac_cv_type_unsigned_long_long = yes \ 99+ test $ac_cv_type_unsigned_long_long_int = yes \
102+ && ac_type='unsigned long long' \ 100+ && ac_type='unsigned long long' \
103+ || ac_type='unsigned long' 101+ || ac_type='unsigned long'
104+ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, 102+ AC_DEFINE_UNQUOTED([uintmax_t], [$ac_type],
105+ [Define to unsigned long or unsigned long long 103+ [Define to unsigned long or unsigned long long
106+ if <inttypes.h> and <stdint.h> don't define.]) 104+ if <stdint.h> and <inttypes.h> don't define.])
105+ else
106+ AC_DEFINE([HAVE_UINTMAX_T], [1],
107+ [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
107+ fi 108+ fi
108+]) 109+])
109--- /dev/null 110--- /dev/null
@@ -143,64 +144,64 @@ Upstream-Status: Pending
143+) 144+)
144--- /dev/null 145--- /dev/null
145+++ bison-1.875/m4/stdint_h.m4 146+++ bison-1.875/m4/stdint_h.m4
146@@ -0,0 +1,28 @@ 147@@ -0,0 +1,27 @@
147+# stdint_h.m4 serial 2 (gettext-0.11.4) 148+# stdint_h.m4 serial 9 (gettext-0.20.1)
148+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. 149+dnl Copyright (C) 1997-2004, 2006, 2008-2019 Free Software Foundation, Inc.
149+dnl This file is free software, distributed under the terms of the GNU 150+dnl This file is free software; the Free Software Foundation
150+dnl General Public License. As a special exception to the GNU General 151+dnl gives unlimited permission to copy and/or distribute it,
151+dnl Public License, this file may be distributed as part of a program 152+dnl with or without modifications, as long as this notice is preserved.
152+dnl that contains a configuration script generated by Autoconf, under
153+dnl the same distribution terms as the rest of that program.
154+ 153+
155+dnl From Paul Eggert. 154+dnl From Paul Eggert.
156+ 155+
157+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, 156+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
158+# doesn't clash with <sys/types.h>, and declares uintmax_t. 157+# doesn't clash with <sys/types.h>, and declares uintmax_t.
159+ 158+
160+AC_DEFUN([jm_AC_HEADER_STDINT_H], 159+AC_DEFUN([gl_AC_HEADER_STDINT_H],
161+[ 160+[
162+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, 161+ AC_CACHE_CHECK([for stdint.h], [gl_cv_header_stdint_h],
163+ [AC_TRY_COMPILE( 162+ [AC_COMPILE_IFELSE(
164+ [#include <sys/types.h> 163+ [AC_LANG_PROGRAM(
165+#include <stdint.h>], 164+ [[#include <sys/types.h>
166+ [uintmax_t i = (uintmax_t) -1;], 165+ #include <stdint.h>]],
167+ jm_ac_cv_header_stdint_h=yes, 166+ [[uintmax_t i = (uintmax_t) -1; return !i;]])],
168+ jm_ac_cv_header_stdint_h=no)]) 167+ [gl_cv_header_stdint_h=yes],
169+ if test $jm_ac_cv_header_stdint_h = yes; then 168+ [gl_cv_header_stdint_h=no])])
170+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, 169+ if test $gl_cv_header_stdint_h = yes; then
171+[Define if <stdint.h> exists, doesn't clash with <sys/types.h>, 170+ AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], [1],
172+ and declares uintmax_t. ]) 171+ [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
172+ and declares uintmax_t. ])
173+ fi 173+ fi
174+]) 174+])
175--- /dev/null 175--- /dev/null
176+++ bison-1.875/m4/inttypes_h.m4 176+++ bison-1.875/m4/inttypes_h.m4
177@@ -0,0 +1,28 @@ 177@@ -0,0 +1,29 @@
178+# inttypes_h.m4 serial 4 (gettext-0.11.4) 178+# inttypes_h.m4 serial 10 (gettext-0.20.1)
179+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. 179+dnl Copyright (C) 1997-2004, 2006, 2008-2019 Free Software Foundation, Inc.
180+dnl This file is free software, distributed under the terms of the GNU 180+dnl This file is free software; the Free Software Foundation
181+dnl General Public License. As a special exception to the GNU General 181+dnl gives unlimited permission to copy and/or distribute it,
182+dnl Public License, this file may be distributed as part of a program 182+dnl with or without modifications, as long as this notice is preserved.
183+dnl that contains a configuration script generated by Autoconf, under
184+dnl the same distribution terms as the rest of that program.
185+ 183+
186+dnl From Paul Eggert. 184+dnl From Paul Eggert.
187+ 185+
188+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, 186+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
189+# doesn't clash with <sys/types.h>, and declares uintmax_t. 187+# doesn't clash with <sys/types.h>, and declares uintmax_t.
190+ 188+
191+AC_DEFUN([jm_AC_HEADER_INTTYPES_H], 189+AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
192+[ 190+[
193+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, 191+ AC_CACHE_CHECK([for inttypes.h], [gl_cv_header_inttypes_h],
194+ [AC_TRY_COMPILE( 192+ [AC_COMPILE_IFELSE(
195+ [#include <sys/types.h> 193+ [AC_LANG_PROGRAM(
196+#include <inttypes.h>], 194+ [[
197+ [uintmax_t i = (uintmax_t) -1;], 195+#include <sys/types.h>
198+ jm_ac_cv_header_inttypes_h=yes, 196+#include <inttypes.h>
199+ jm_ac_cv_header_inttypes_h=no)]) 197+ ]],
200+ if test $jm_ac_cv_header_inttypes_h = yes; then 198+ [[uintmax_t i = (uintmax_t) -1; return !i;]])],
201+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, 199+ [gl_cv_header_inttypes_h=yes],
202+[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, 200+ [gl_cv_header_inttypes_h=no])])
203+ and declares uintmax_t. ]) 201+ if test $gl_cv_header_inttypes_h = yes; then
202+ AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], [1],
203+ [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
204+ and declares uintmax_t. ])
204+ fi 205+ fi
205+]) 206+])
206--- /dev/null 207--- /dev/null