diff options
Diffstat (limited to 'package/bison')
| -rw-r--r-- | package/bison/Makefile | 4 | ||||
| -rw-r--r-- | package/bison/patches/patch-lib_fseterr_c | 11 | ||||
| -rw-r--r-- | package/bison/patches/patch-lib_vasnprintf_c | 28 |
3 files changed, 2 insertions, 41 deletions
diff --git a/package/bison/Makefile b/package/bison/Makefile index f7716611e..5bc9cce8d 100644 --- a/package/bison/Makefile +++ b/package/bison/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bison -PKG_VERSION:= 3.0.4 +PKG_VERSION:= 3.8.2 PKG_RELEASE:= 1 -PKG_HASH:= a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1 +PKG_HASH:= 9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2 PKG_DESCR:= parser generator PKG_SECTION:= dev/tools PKG_BUILDDEP:= m4-host bison-host diff --git a/package/bison/patches/patch-lib_fseterr_c b/package/bison/patches/patch-lib_fseterr_c deleted file mode 100644 index 06af7469f..000000000 --- a/package/bison/patches/patch-lib_fseterr_c +++ /dev/null @@ -1,11 +0,0 @@ ---- bison-3.0.4.orig/lib/fseterr.c 2015-01-04 16:43:50.000000000 +0000 -+++ bison-3.0.4/lib/fseterr.c 2019-05-06 08:24:42.407830562 +0000 -@@ -29,7 +29,7 @@ fseterr (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags |= _IO_ERR_SEEN; - #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ - fp_->_flags |= __SERR; diff --git a/package/bison/patches/patch-lib_vasnprintf_c b/package/bison/patches/patch-lib_vasnprintf_c deleted file mode 100644 index cb21d90fa..000000000 --- a/package/bison/patches/patch-lib_vasnprintf_c +++ /dev/null @@ -1,28 +0,0 @@ ---- bison-3.0.4.orig/lib/vasnprintf.c 2015-01-04 17:46:03.000000000 +0100 -+++ bison-3.0.4/lib/vasnprintf.c 2018-02-24 21:13:43.000000000 +0100 -@@ -4858,7 +4858,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ -+ && !defined __UCLIBC__) \ -+ || (defined __APPLE__ && defined __MACH__) \ -+ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; -@@ -4872,6 +4875,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - in format strings in writable memory may crash the program - (if compiled with _FORTIFY_SOURCE=2), so we should avoid it - in this situation. */ -+ /* On Mac OS X 10.3 or newer, we know that snprintf's return -+ value conforms to ISO C 99: the tests gl_SNPRINTF_RETVAL_C99 -+ and gl_SNPRINTF_TRUNCATION_C99 pass. -+ Therefore we can avoid using %n in this situation. -+ On Mac OS X 10.13 or newer, the use of %n in format strings -+ in writable memory by default crashes the program, so we -+ should avoid it in this situation. */ - /* On native Windows systems (such as mingw), we can avoid using - %n because: - - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, |