Revert "Update to bison-3.8.2."
This reverts commit b82fae810b42c5426d21c4dc153b32f086dd7fde.
This commit is contained in:
parent
be9d4bdf36
commit
ba51698db2
3 changed files with 83 additions and 26 deletions
|
@ -1,3 +1,15 @@
|
|||
diff -Paur --no-dereference -- bison.upstream/build-aux/config.sub bison/build-aux/config.sub
|
||||
--- bison.upstream/build-aux/config.sub
|
||||
+++ bison/build-aux/config.sub
|
||||
@@ -1356,7 +1356,7 @@
|
||||
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
|
||||
| -sym* | -kopensolaris* | -plan9* \
|
||||
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
||||
- | -aos* | -aros* \
|
||||
+ | -aos* | -aros* | -sortix* \
|
||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
||||
diff -Paur --no-dereference -- bison.upstream/configure bison/configure
|
||||
--- bison.upstream/configure
|
||||
+++ bison/configure
|
||||
|
@ -122,7 +134,7 @@ diff -Paur --no-dereference -- bison.upstream/configure bison/configure
|
|||
+export gl_cv_func_getcwd_null=yes # Only if the OS actually supports this, Sortix does.
|
||||
+export gl_cv_struct_dirent_d_ino=yes # Only if the OS actually supports this, Sortix does.
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.71 for GNU Bison 3.8.2.
|
||||
# Generated by GNU Autoconf 2.69 for GNU Bison 3.0.2.
|
||||
#
|
||||
diff -Paur --no-dereference -- bison.upstream/lib/spawn_faction_addclose.c bison/lib/spawn_faction_addclose.c
|
||||
--- bison.upstream/lib/spawn_faction_addclose.c
|
||||
|
@ -135,7 +147,7 @@ diff -Paur --no-dereference -- bison.upstream/lib/spawn_faction_addclose.c bison
|
|||
-# define __sysconf(open_max) getdtablesize ()
|
||||
-#endif
|
||||
-
|
||||
#if REPLACE_POSIX_SPAWN
|
||||
#if !HAVE_WORKING_POSIX_SPAWN
|
||||
# include "spawn_int.h"
|
||||
#endif
|
||||
@@ -37,7 +33,7 @@
|
||||
|
@ -158,7 +170,7 @@ diff -Paur --no-dereference -- bison.upstream/lib/spawn_faction_adddup2.c bison/
|
|||
-# define __sysconf(open_max) getdtablesize ()
|
||||
-#endif
|
||||
-
|
||||
#if REPLACE_POSIX_SPAWN
|
||||
#if !HAVE_WORKING_POSIX_SPAWN
|
||||
# include "spawn_int.h"
|
||||
#endif
|
||||
@@ -37,7 +33,7 @@
|
||||
|
@ -173,18 +185,18 @@ diff -Paur --no-dereference -- bison.upstream/lib/spawn_faction_adddup2.c bison/
|
|||
diff -Paur --no-dereference -- bison.upstream/lib/spawn_faction_addopen.c bison/lib/spawn_faction_addopen.c
|
||||
--- bison.upstream/lib/spawn_faction_addopen.c
|
||||
+++ bison/lib/spawn_faction_addopen.c
|
||||
@@ -24,10 +24,6 @@
|
||||
#include <string.h>
|
||||
@@ -22,10 +22,6 @@
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
|
||||
-#if !_LIBC
|
||||
-# define __sysconf(open_max) getdtablesize ()
|
||||
-#endif
|
||||
-
|
||||
#if REPLACE_POSIX_SPAWN
|
||||
#if !HAVE_WORKING_POSIX_SPAWN
|
||||
# include "spawn_int.h"
|
||||
#endif
|
||||
@@ -40,7 +36,7 @@
|
||||
@@ -38,7 +34,7 @@
|
||||
mode_t mode)
|
||||
#undef posix_spawn_file_actions_addopen
|
||||
{
|
||||
|
@ -196,11 +208,63 @@ diff -Paur --no-dereference -- bison.upstream/lib/spawn_faction_addopen.c bison/
|
|||
diff -Paur --no-dereference -- bison.upstream/Makefile.in bison/Makefile.in
|
||||
--- bison.upstream/Makefile.in
|
||||
+++ bison/Makefile.in
|
||||
@@ -10935,6 +10935,7 @@
|
||||
clean-noinstLIBRARIES mostlyclean-am
|
||||
|
||||
@@ -2297,7 +2297,7 @@
|
||||
# Obfuscate with a variable.
|
||||
doc_bison = doc/bison
|
||||
TEXI2DVI = texi2dvi --build-dir=doc/bison.t2d -I doc
|
||||
-CLEANDIRS = doc/bison.t2d doc/figs doc/html
|
||||
+CLEANDIRS = doc/bison.t2d doc/html
|
||||
CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl
|
||||
CROSS_OPTIONS_TEXI = $(top_srcdir)/doc/cross-options.texi
|
||||
MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI) \
|
||||
@@ -4922,6 +4922,8 @@
|
||||
distclean: distclean-recursive
|
||||
+ -rm -f doc/stamp-vti
|
||||
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
|
||||
-rm -f examples/c++/$(DEPDIR)/simple-simple.Po
|
||||
-rm -f examples/c++/$(DEPDIR)/variant-variant.Po
|
||||
-rm -rf examples/calc++/$(DEPDIR) examples/mfcalc/$(DEPDIR) examples/rpcalc/$(DEPDIR) lib/$(DEPDIR) lib/glthread/$(DEPDIR) lib/uniwidth/$(DEPDIR) src/$(DEPDIR)
|
||||
+ -rm -f $(INFO_DEPS)
|
||||
+ -rm -f $(CROSS_OPTIONS_TEXI)
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-compile distclean-generic \
|
||||
distclean-hdr distclean-local distclean-tags
|
||||
@@ -5145,22 +5147,28 @@
|
||||
doc/refcard.pdf: doc/refcard.tex
|
||||
$(AM_V_GEN) cd doc && pdftex $(abs_top_srcdir)/doc/refcard.tex
|
||||
$(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
|
||||
- $(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
|
||||
- $(AM_V_at) src/bison$(EXEEXT) --help >>doc/bison.help.tmp
|
||||
- $(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
|
||||
+ # PATCH: Nope! You can't run your programs after they have been potentially
|
||||
+ # cross-compiled so don't even try!
|
||||
+ #$(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
|
||||
+ #$(AM_V_at) src/bison$(EXEEXT) --help >>doc/bison.help.tmp
|
||||
+ #$(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
|
||||
+ touch $@
|
||||
|
||||
# Depend on configure to get version number changes.
|
||||
$(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure
|
||||
- $(AM_V_GEN)$(HELP2MAN) \
|
||||
- --include=$(top_srcdir)/doc/bison.x \
|
||||
- --output=$@.t src/bison$(EXEEXT)
|
||||
- $(AM_V_at)if $(remove_time_stamp) $@ >$@a.t 2>/dev/null && \
|
||||
- $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \
|
||||
- touch $@; \
|
||||
- else \
|
||||
- mv $@.t $@; \
|
||||
- fi
|
||||
- $(AM_V_at)rm -f $@*.t
|
||||
+ # PATCH: Nope! You can't run your programs after they have been potentially
|
||||
+ # cross-compiled so don't even try!
|
||||
+ #$(AM_V_GEN)$(HELP2MAN) \
|
||||
+ # --include=$(top_srcdir)/doc/bison.x \
|
||||
+ # --output=$@.t src/bison$(EXEEXT)
|
||||
+ #$(AM_V_at)if $(remove_time_stamp) $@ >$@a.t 2>/dev/null && \
|
||||
+ # $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \
|
||||
+ # touch $@; \
|
||||
+ #else \
|
||||
+ # mv $@.t $@; \
|
||||
+ #fi
|
||||
+ #$(AM_V_at)rm -f $@*.t
|
||||
+ touch $@
|
||||
|
||||
.gv.eps:
|
||||
$(AM_V_GEN) $(MKDIR_P) `echo "./$@" | sed -e 's,/[^/]*$$,,'`
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
NAME=bison
|
||||
BUILD_LIBRARIES='libstdc++? libiconv? libintl? libreadline? libtextstyle?'
|
||||
VERSION=3.8.2
|
||||
BUILD_LIBRARIES='libstdc++? libiconv?'
|
||||
VERSION=3.0.2
|
||||
DISTNAME=$NAME-$VERSION
|
||||
COMPRESSION=tar.xz
|
||||
ARCHIVE=$DISTNAME.$COMPRESSION
|
||||
SHA256SUM=9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2
|
||||
SHA256SUM=a2c3e8528bdb50567d6fa26deeb493dc5ccd7e277b865251608a9e43ac928f3c
|
||||
UPSTREAM_SITE=https://ftp.gnu.org/gnu/bison
|
||||
UPSTREAM_ARCHIVE=$ARCHIVE
|
||||
LICENSE=GPL-3.0-or-later
|
||||
BUILD_SYSTEM=configure
|
||||
MAKE_VARS='V=1'
|
||||
|
|
|
@ -1,10 +1,4 @@
|
|||
rm -rf -- 'doc/figs/example-reduce.eps'
|
||||
rm -rf -- 'doc/figs/example-reduce.pdf'
|
||||
rm -rf -- 'doc/figs/example-reduce.svg'
|
||||
rm -rf -- 'doc/figs/example-shift.eps'
|
||||
rm -rf -- 'doc/figs/example-shift.pdf'
|
||||
rm -rf -- 'doc/figs/example-shift.svg'
|
||||
rm -rf -- 'doc/figs/example.eps'
|
||||
rm -rf -- 'doc/figs/example.pdf'
|
||||
rm -rf -- 'doc/figs/example.svg'
|
||||
rm -rf -- 'doc/bison.info'
|
||||
rm -rf -- 'doc/cross-options.texi'
|
||||
rm -rf -- 'doc/stamp-vti'
|
||||
rm -rf -- 'doc/version.texi'
|
||||
|
|
Loading…
Reference in a new issue