summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-01-08 11:08:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-11 10:26:06 +0000
commit4dd6f5f5bfd8b4d3740ae56e88af6464d06ed0fa (patch)
tree4be3f78f071dc86725607b5d3af5d9740050946a /meta
parent47022546cfa6c509c8f11e52c3e6310ac68660a3 (diff)
downloadpoky-4dd6f5f5bfd8b4d3740ae56e88af6464d06ed0fa.tar.gz
bison: remove obsolete patch
m4.patch was added before 2005 (history isn't in git, only BitKeeper) and doesn't appear to be needed anymore. Also add a comment to clarify why acpaths is required. (From OE-Core rev: 1ef90df9c5cc628c885897027d8c5ec6f318d68e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/bison/bison/m4.patch414
-rw-r--r--meta/recipes-devtools/bison/bison_3.0.4.bb3
2 files changed, 2 insertions, 415 deletions
diff --git a/meta/recipes-devtools/bison/bison/m4.patch b/meta/recipes-devtools/bison/bison/m4.patch
deleted file mode 100644
index d139da5e79..0000000000
--- a/meta/recipes-devtools/bison/bison/m4.patch
+++ /dev/null
@@ -1,414 +0,0 @@
1Upstream-Status: Pending
2
3#
4# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
5#
6
7Index: bison-2.4.2/m4/lcmessage.m4
8===================================================================
9--- /dev/null
10+++ bison-2.4.2/m4/lcmessage.m4
11@@ -0,0 +1,32 @@
12+# lcmessage.m4 serial 3 (gettext-0.11.3)
13+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
14+dnl This file is free software, distributed under the terms of the GNU
15+dnl General Public License. As a special exception to the GNU General
16+dnl Public License, this file may be distributed as part of a program
17+dnl that contains a configuration script generated by Autoconf, under
18+dnl the same distribution terms as the rest of that program.
19+dnl
20+dnl This file can can be used in projects which are not available under
21+dnl the GNU General Public License or the GNU Library General Public
22+dnl License but which still want to provide support for the GNU gettext
23+dnl functionality.
24+dnl Please note that the actual code of the GNU gettext library is covered
25+dnl by the GNU Library General Public License, and the rest of the GNU
26+dnl gettext package package is covered by the GNU General Public License.
27+dnl They are *not* in the public domain.
28+
29+dnl Authors:
30+dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
31+
32+# Check whether LC_MESSAGES is available in <locale.h>.
33+
34+AC_DEFUN([AM_LC_MESSAGES],
35+[
36+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
37+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
38+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
39+ if test $am_cv_val_LC_MESSAGES = yes; then
40+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
41+ [Define if your <locale.h> file defines LC_MESSAGES.])
42+ fi
43+])
44Index: bison-2.4.2/m4/uintmax_t.m4
45===================================================================
46--- /dev/null
47+++ bison-2.4.2/m4/uintmax_t.m4
48@@ -0,0 +1,29 @@
49+# uintmax_t.m4 serial 6 (gettext-0.11)
50+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
51+dnl This file is free software, distributed under the terms of the GNU
52+dnl General Public License. As a special exception to the GNU General
53+dnl Public License, this file may be distributed as part of a program
54+dnl that contains a configuration script generated by Autoconf, under
55+dnl the same distribution terms as the rest of that program.
56+
57+dnl From Paul Eggert.
58+
59+AC_PREREQ(2.13)
60+
61+# Define uintmax_t to `unsigned long' or `unsigned long long'
62+# if <inttypes.h> does not exist.
63+
64+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
65+[
66+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
67+ AC_REQUIRE([jm_AC_HEADER_STDINT_H])
68+ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
69+ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
70+ test $ac_cv_type_unsigned_long_long = yes \
71+ && ac_type='unsigned long long' \
72+ || ac_type='unsigned long'
73+ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
74+ [Define to unsigned long or unsigned long long
75+ if <inttypes.h> and <stdint.h> don't define.])
76+ fi
77+])
78Index: bison-2.4.2/m4/ulonglong.m4
79===================================================================
80--- /dev/null
81+++ bison-2.4.2/m4/ulonglong.m4
82@@ -0,0 +1,23 @@
83+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
84+dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
85+dnl This file is free software, distributed under the terms of the GNU
86+dnl General Public License. As a special exception to the GNU General
87+dnl Public License, this file may be distributed as part of a program
88+dnl that contains a configuration script generated by Autoconf, under
89+dnl the same distribution terms as the rest of that program.
90+
91+dnl From Paul Eggert.
92+
93+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
94+[
95+ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
96+ [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
97+ [unsigned long long ullmax = (unsigned long long) -1;
98+ return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
99+ ac_cv_type_unsigned_long_long=yes,
100+ ac_cv_type_unsigned_long_long=no)])
101+ if test $ac_cv_type_unsigned_long_long = yes; then
102+ AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
103+ [Define if you have the unsigned long long type.])
104+ fi
105+])
106Index: bison-2.4.2/m4/intdiv0.m4
107===================================================================
108--- /dev/null
109+++ bison-2.4.2/m4/intdiv0.m4
110@@ -0,0 +1,72 @@
111+# intdiv0.m4 serial 1 (gettext-0.11.3)
112+dnl Copyright (C) 2002 Free Software Foundation, Inc.
113+dnl This file is free software, distributed under the terms of the GNU
114+dnl General Public License. As a special exception to the GNU General
115+dnl Public License, this file may be distributed as part of a program
116+dnl that contains a configuration script generated by Autoconf, under
117+dnl the same distribution terms as the rest of that program.
118+
119+dnl From Bruno Haible.
120+
121+AC_DEFUN([gt_INTDIV0],
122+[
123+ AC_REQUIRE([AC_PROG_CC])dnl
124+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
125+
126+ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
127+ gt_cv_int_divbyzero_sigfpe,
128+ [
129+ AC_TRY_RUN([
130+#include <stdlib.h>
131+#include <signal.h>
132+
133+static void
134+#ifdef __cplusplus
135+sigfpe_handler (int sig)
136+#else
137+sigfpe_handler (sig) int sig;
138+#endif
139+{
140+ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
141+ exit (sig != SIGFPE);
142+}
143+
144+int x = 1;
145+int y = 0;
146+int z;
147+int nan;
148+
149+int main ()
150+{
151+ signal (SIGFPE, sigfpe_handler);
152+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
153+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
154+ signal (SIGTRAP, sigfpe_handler);
155+#endif
156+/* Linux/SPARC yields signal SIGILL. */
157+#if defined (__sparc__) && defined (__linux__)
158+ signal (SIGILL, sigfpe_handler);
159+#endif
160+
161+ z = x / y;
162+ nan = y / y;
163+ exit (1);
164+}
165+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
166+ [
167+ # Guess based on the CPU.
168+ case "$host_cpu" in
169+ alpha* | i[34567]86 | m68k | s390*)
170+ gt_cv_int_divbyzero_sigfpe="guessing yes";;
171+ *)
172+ gt_cv_int_divbyzero_sigfpe="guessing no";;
173+ esac
174+ ])
175+ ])
176+ case "$gt_cv_int_divbyzero_sigfpe" in
177+ *yes) value=1;;
178+ *) value=0;;
179+ esac
180+ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
181+ [Define if integer division by zero raises signal SIGFPE.])
182+])
183Index: bison-2.4.2/m4/glib.m4
184===================================================================
185--- /dev/null
186+++ bison-2.4.2/m4/glib.m4
187@@ -0,0 +1,196 @@
188+# Configure paths for GLIB
189+# Owen Taylor 97-11-3
190+
191+dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
192+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
193+dnl gthread is specified in MODULES, pass to glib-config
194+dnl
195+AC_DEFUN(AM_PATH_GLIB,
196+[dnl
197+dnl Get the cflags and libraries from the glib-config script
198+dnl
199+AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
200+ glib_config_prefix="$withval", glib_config_prefix="")
201+AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
202+ glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
203+AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
204+ , enable_glibtest=yes)
205+
206+ if test x$glib_config_exec_prefix != x ; then
207+ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
208+ if test x${GLIB_CONFIG+set} != xset ; then
209+ GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
210+ fi
211+ fi
212+ if test x$glib_config_prefix != x ; then
213+ glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
214+ if test x${GLIB_CONFIG+set} != xset ; then
215+ GLIB_CONFIG=$glib_config_prefix/bin/glib-config
216+ fi
217+ fi
218+
219+ for module in . $4
220+ do
221+ case "$module" in
222+ gmodule)
223+ glib_config_args="$glib_config_args gmodule"
224+ ;;
225+ gthread)
226+ glib_config_args="$glib_config_args gthread"
227+ ;;
228+ esac
229+ done
230+
231+ AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
232+ min_glib_version=ifelse([$1], ,0.99.7,$1)
233+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
234+ no_glib=""
235+ if test "$GLIB_CONFIG" = "no" ; then
236+ no_glib=yes
237+ else
238+ GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
239+ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
240+ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
241+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
242+ glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
243+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
244+ glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
245+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
246+ if test "x$enable_glibtest" = "xyes" ; then
247+ ac_save_CFLAGS="$CFLAGS"
248+ ac_save_LIBS="$LIBS"
249+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
250+ LIBS="$GLIB_LIBS $LIBS"
251+dnl
252+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
253+dnl checks the results of glib-config to some extent
254+dnl
255+ rm -f conf.glibtest
256+ AC_TRY_RUN([
257+#include <glib.h>
258+#include <stdio.h>
259+#include <stdlib.h>
260+
261+int
262+main ()
263+{
264+ int major, minor, micro;
265+ char *tmp_version;
266+
267+ system ("touch conf.glibtest");
268+
269+ /* HP/UX 9 (%@#!) writes to sscanf strings */
270+ tmp_version = g_strdup("$min_glib_version");
271+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
272+ printf("%s, bad version string\n", "$min_glib_version");
273+ exit(1);
274+ }
275+
276+ if ((glib_major_version != $glib_config_major_version) ||
277+ (glib_minor_version != $glib_config_minor_version) ||
278+ (glib_micro_version != $glib_config_micro_version))
279+ {
280+ printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
281+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
282+ glib_major_version, glib_minor_version, glib_micro_version);
283+ printf ("*** was found! If glib-config was correct, then it is best\n");
284+ printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
285+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
286+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
287+ printf("*** required on your system.\n");
288+ printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
289+ printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
290+ printf("*** before re-running configure\n");
291+ }
292+ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
293+ (glib_minor_version != GLIB_MINOR_VERSION) ||
294+ (glib_micro_version != GLIB_MICRO_VERSION))
295+ {
296+ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
297+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
298+ printf("*** library (version %d.%d.%d)\n",
299+ glib_major_version, glib_minor_version, glib_micro_version);
300+ }
301+ else
302+ {
303+ if ((glib_major_version > major) ||
304+ ((glib_major_version == major) && (glib_minor_version > minor)) ||
305+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
306+ {
307+ return 0;
308+ }
309+ else
310+ {
311+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
312+ glib_major_version, glib_minor_version, glib_micro_version);
313+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
314+ major, minor, micro);
315+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
316+ printf("***\n");
317+ printf("*** If you have already installed a sufficiently new version, this error\n");
318+ printf("*** probably means that the wrong copy of the glib-config shell script is\n");
319+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
320+ printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
321+ printf("*** correct copy of glib-config. (In this case, you will have to\n");
322+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
323+ printf("*** so that the correct libraries are found at run-time))\n");
324+ }
325+ }
326+ return 1;
327+}
328+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
329+ CFLAGS="$ac_save_CFLAGS"
330+ LIBS="$ac_save_LIBS"
331+ fi
332+ fi
333+ if test "x$no_glib" = x ; then
334+ AC_MSG_RESULT(yes)
335+ ifelse([$2], , :, [$2])
336+ else
337+ AC_MSG_RESULT(no)
338+ if test "$GLIB_CONFIG" = "no" ; then
339+ echo "*** The glib-config script installed by GLIB could not be found"
340+ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
341+ echo "*** your path, or set the GLIB_CONFIG environment variable to the"
342+ echo "*** full path to glib-config."
343+ else
344+ if test -f conf.glibtest ; then
345+ :
346+ else
347+ echo "*** Could not run GLIB test program, checking why..."
348+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
349+ LIBS="$LIBS $GLIB_LIBS"
350+ AC_TRY_LINK([
351+#include <glib.h>
352+#include <stdio.h>
353+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
354+ [ echo "*** The test program compiled, but did not run. This usually means"
355+ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
356+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
357+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
358+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
359+ echo "*** is required on your system"
360+ echo "***"
361+ echo "*** If you have an old version installed, it is best to remove it, although"
362+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
363+ echo "***"
364+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
365+ echo "*** came with the system with the command"
366+ echo "***"
367+ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
368+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
369+ echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
370+ echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
371+ echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
372+ CFLAGS="$ac_save_CFLAGS"
373+ LIBS="$ac_save_LIBS"
374+ fi
375+ fi
376+ GLIB_CFLAGS=""
377+ GLIB_LIBS=""
378+ ifelse([$3], , :, [$3])
379+ fi
380+ AC_SUBST(GLIB_CFLAGS)
381+ AC_SUBST(GLIB_LIBS)
382+ rm -f conf.glibtest
383+])
384Index: bison-2.4.2/m4/isc-posix.m4
385===================================================================
386--- /dev/null
387+++ bison-2.4.2/m4/isc-posix.m4
388@@ -0,0 +1,26 @@
389+# isc-posix.m4 serial 2 (gettext-0.11.2)
390+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
391+dnl This file is free software, distributed under the terms of the GNU
392+dnl General Public License. As a special exception to the GNU General
393+dnl Public License, this file may be distributed as part of a program
394+dnl that contains a configuration script generated by Autoconf, under
395+dnl the same distribution terms as the rest of that program.
396+
397+# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
398+
399+# This test replaces the one in autoconf.
400+# Currently this macro should have the same name as the autoconf macro
401+# because gettext's gettext.m4 (distributed in the automake package)
402+# still uses it. Otherwise, the use in gettext.m4 makes autoheader
403+# give these diagnostics:
404+# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
405+# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
406+
407+undefine([AC_ISC_POSIX])
408+
409+AC_DEFUN([AC_ISC_POSIX],
410+ [
411+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
412+ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
413+ ]
414+)
diff --git a/meta/recipes-devtools/bison/bison_3.0.4.bb b/meta/recipes-devtools/bison/bison_3.0.4.bb
index 7d066be0ad..e5ac5672f8 100644
--- a/meta/recipes-devtools/bison/bison_3.0.4.bb
+++ b/meta/recipes-devtools/bison/bison_3.0.4.bb
@@ -10,7 +10,6 @@ SECTION = "devel"
10DEPENDS = "bison-native flex-native" 10DEPENDS = "bison-native flex-native"
11 11
12SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ 12SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
13 file://m4.patch \
14 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ 13 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
15 file://dont-depend-on-help2man.patch.patch \ 14 file://dont-depend-on-help2man.patch.patch \
16 file://0001-src-local.mk-fix-parallel-issue.patch \ 15 file://0001-src-local.mk-fix-parallel-issue.patch \
@@ -26,6 +25,8 @@ SRC_URI[sha256sum] = "a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0
26DEPENDS_class-native = "gettext-minimal-native" 25DEPENDS_class-native = "gettext-minimal-native"
27 26
28inherit autotools gettext texinfo 27inherit autotools gettext texinfo
28
29# The automatic m4 path detection gets confused, so force the right value
29acpaths = "-I ${S}/m4" 30acpaths = "-I ${S}/m4"
30 31
31do_compile_prepend() { 32do_compile_prepend() {