* bison 3.1 - Update to latest version

* bison - 3.1 -fix package.
This commit is contained in:
J. Peter Mugaas
2018-10-02 08:15:13 -04:00
committed by Алексей
parent f4ec52ed6f
commit e7176b350f
2 changed files with 19 additions and 29 deletions

View File

@@ -1,7 +1,7 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=bison
pkgver=3.0.5
pkgver=3.1
pkgrel=1
pkgdesc="The GNU general-purpose parser generator"
arch=('i686' 'x86_64')
@@ -13,16 +13,18 @@ options=('staticlibs')
makedepends=('flex')
install=bison.install
source=(https://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}
bison-3.0.5-msys2.patch
bison-3.1-msys2.patch
bison-3.0.5-gettext-0.19.patch)
sha256sums=('075cef2e814642e30e10e8155e93022e4a91ca38a65aa1d5467d4e969f97f338'
sha256sums=('7c2464ad6cb7b513b2c350a092d919327e1f63d12ff024836acbb504475da5c6'
'SKIP'
'012c3055c57a83525b05fd51056b949810a3289335e0accdb74d55d32648dddc'
'a246955dc355150a80228a556a6954e38c527e3cd6ab03b5df4e41df00a198b3'
'100f3ff1cd68a080b803a4f4a86a0a11b660e2b3b89f7ec95afa0437ee2b2b5c')
validpgpkeys=('7DF84374B1EE1F9764BBE25D0DDCAA3278D5264E') # Akim Demaille
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 -i ${srcdir}/bison-3.0.5-msys2.patch
patch -p1 -i ${srcdir}/bison-3.1-msys2.patch
patch -p1 -i ${srcdir}/bison-3.0.5-gettext-0.19.patch
autoreconf -vfi

View File

@@ -80,18 +80,6 @@ diff -Naur bison-3.0.5-orig/build-aux/config.rpath bison-3.0.5/build-aux/config.
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
diff -Naur bison-3.0.5-orig/lib/gnulib.mk bison-3.0.5/lib/gnulib.mk
--- bison-3.0.5-orig/lib/gnulib.mk 2018-05-27 12:34:20.000000000 +0300
+++ bison-3.0.5/lib/gnulib.mk 2018-05-31 08:49:39.149826800 +0300
@@ -805,7 +805,7 @@
case '$(host_os)' in \
darwin[56]*) \
need_charset_alias=true ;; \
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
need_charset_alias=false ;; \
*) \
need_charset_alias=true ;; \
diff -Naur bison-3.0.5-orig/m4/double-slash-root.m4 bison-3.0.5/m4/double-slash-root.m4
--- bison-3.0.5-orig/m4/double-slash-root.m4 2018-05-08 13:02:49.000000000 +0300
+++ bison-3.0.5/m4/double-slash-root.m4 2018-05-31 08:49:39.227827000 +0300
@@ -116,6 +104,18 @@ diff -Naur bison-3.0.5-orig/m4/dup2.m4 bison-3.0.5/m4/dup2.m4
gl_cv_func_dup2_works="guessing no" ;;
aix* | freebsd*)
# on AIX 7.1 and FreeBSD 6.1, dup2 (1,toobig) gives EMFILE,
diff -aurp bison-3.1/m4/fcntl.m4.orig bison-3.1/m4/fcntl.m4
--- bison-3.1/m4/fcntl.m4.orig 2018-10-01 07:19:34.862451100 -0400
+++ bison-3.1/m4/fcntl.m4 2018-10-01 07:22:21.605390400 -0400
@@ -69,7 +69,7 @@ AC_DEFUN([gl_FUNC_FCNTL],
[gl_cv_func_fcntl_f_dupfd_works=yes],
[gl_cv_func_fcntl_f_dupfd_works=no],
[case $host_os in
- aix* | cygwin* | haiku*)
+ aix* | cygwin* | msys* | haiku*)
gl_cv_func_fcntl_f_dupfd_works="guessing no" ;;
*) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;;
esac])])
diff -Naur bison-3.0.5-orig/m4/getdtablesize.m4 bison-3.0.5/m4/getdtablesize.m4
--- bison-3.0.5-orig/m4/getdtablesize.m4 2018-05-08 13:02:49.000000000 +0300
+++ bison-3.0.5/m4/getdtablesize.m4 2018-05-31 08:53:34.677327300 +0300
@@ -194,15 +194,3 @@ diff -Naur bison-3.0.5-orig/m4/threadlib.m4 bison-3.0.5/m4/threadlib.m4
case `uname -r` in
1.[0-5].*) gl_use_threads=no ;;
*) gl_use_threads=yes ;;
diff -Naur bison-3.0.5-orig/Makefile.in bison-3.0.5/Makefile.in
--- bison-3.0.5-orig/Makefile.in 2018-05-27 12:54:20.000000000 +0300
+++ bison-3.0.5/Makefile.in 2018-05-31 08:49:39.461827400 +0300
@@ -6122,7 +6122,7 @@
case '$(host_os)' in \
darwin[56]*) \
need_charset_alias=true ;; \
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+ darwin* | cygwin* | msys* | mingw* | pw32* | cegcc*) \
need_charset_alias=false ;; \
*) \
need_charset_alias=true ;; \