bison: Update to 3.8.1

msys2 · Sep 12, 2021 · b8b639a · b8b639a
1 parent d635d59
commit b8b639a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 54 deletions.
diff --git a/bison/PKGBUILD b/bison/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=bison
-pkgver=3.7.6
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="The GNU general-purpose parser generator"
 arch=('i686' 'x86_64')
@@ -14,12 +14,11 @@ makedepends=('flex')
 install=bison.install
 source=(https://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}
         bison-3.1-msys2.patch)
-sha256sums=('67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf'
+sha256sums=('31fc602488aad6bdecf0ccc556e0fc72fc57cdc595cf92398f020e0cf4980f15'
             'SKIP'
-            '3c4253ba6088bed5581617142a3bb4497ff20e28831c57adba46fc8028fd989c')
+            '2ba57d420b630e57225b23f684317c7e399510a69a3ab9f3dcd5eafa4ff9c321')
 validpgpkeys=('7DF84374B1EE1F9764BBE25D0DDCAA3278D5264E')  # Akim Demaille
 
-
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -p1 -i ${srcdir}/bison-3.1-msys2.patch

diff --git a/bison/bison-3.1-msys2.patch b/bison/bison-3.1-msys2.patch
@@ -1,37 +1,16 @@
-diff -Naur bison-3.0.5-orig/build-aux/compile bison-3.0.5/build-aux/compile
---- bison-3.0.5-orig/build-aux/compile	2018-05-27 12:34:40.000000000 +0300
-+++ bison-3.0.5/build-aux/compile	2018-05-31 08:49:39.118626800 +0300
-@@ -53,7 +53,7 @@
- 	  MINGW*)
- 	    file_conv=mingw
- 	    ;;
--	  CYGWIN*)
-+	  CYGWIN* | MSYS*)
- 	    file_conv=cygwin
- 	    ;;
- 	  *)
-@@ -67,7 +67,7 @@
- 	mingw/*)
- 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
- 	  ;;
--	cygwin/*)
-+	cygwin/* | msys/*)
- 	  file=`cygpath -m "$file" || echo "$file"`
- 	  ;;
- 	wine/*)
 diff -Naur bison-3.0.5-orig/build-aux/config.guess bison-3.0.5/build-aux/config.guess
 --- bison-3.0.5-orig/build-aux/config.guess	2018-05-08 13:02:48.000000000 +0300
 +++ bison-3.0.5/build-aux/config.guess	2018-05-31 08:52:50.957050300 +0300
-@@ -883,6 +883,9 @@
+@@ -947,6 +947,9 @@
      amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
+ 	GUESS=x86_64-pc-cygwin
+ 	;;
 +    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
 +	echo x86_64-unknown-msys
 +	exit ;;
      prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
- 	exit ;;
+ 	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ 	GUESS=powerpcle-unknown-solaris2$SUN_REL
 diff -Naur bison-3.0.5-orig/build-aux/config.rpath bison-3.0.5/build-aux/config.rpath
 --- bison-3.0.5-orig/build-aux/config.rpath	2018-05-08 13:02:48.000000000 +0300
 +++ bison-3.0.5/build-aux/config.rpath	2018-05-31 08:49:39.149826800 +0300
@@ -128,18 +107,6 @@ diff -Naur bison-3.0.5-orig/m4/getdtablesize.m4 bison-3.0.5/m4/getdtablesize.m4
                    gl_cv_func_getdtablesize_works="guessing no" ;;
                  *) gl_cv_func_getdtablesize_works="guessing yes" ;;
                esac
-diff -Naur bison-3.0.5-orig/m4/malloc.m4 bison-3.0.5/m4/malloc.m4
---- bison-3.0.5-orig/m4/malloc.m4	2018-05-08 13:02:49.000000000 +0300
-+++ bison-3.0.5/m4/malloc.m4	2018-05-31 08:53:58.982170000 +0300
-@@ -33,7 +33,7 @@
-        [case "$host_os" in
-           # Guess yes on platforms where we know the result.
-           *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
--          | hpux* | solaris* | cygwin* | mingw*)
-+          | hpux* | solaris* | cygwin* | msys* | mingw*)
-             ac_cv_func_malloc_0_nonnull="guessing yes" ;;
-           # If we don't know, assume the worst.
-           *) ac_cv_func_malloc_0_nonnull="guessing no" ;;
 diff -Naur bison-3.0.5-orig/m4/printf.m4 bison-3.0.5/m4/printf.m4
 --- bison-3.0.5-orig/m4/printf.m4	2018-05-08 13:02:49.000000000 +0300
 +++ bison-3.0.5/m4/printf.m4	2018-05-31 08:54:22.304211000 +0300
@@ -159,18 +126,6 @@ diff -Naur bison-3.0.5-orig/m4/printf.m4 bison-3.0.5/m4/printf.m4
                                   # Guess yes on Solaris >= 2.6.
             solaris2.[0-5] | solaris2.[0-5].*)
                                   gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-diff -Naur bison-3.0.5-orig/m4/realloc.m4 bison-3.0.5/m4/realloc.m4
---- bison-3.0.5-orig/m4/realloc.m4	2018-05-08 13:02:49.000000000 +0300
-+++ bison-3.0.5/m4/realloc.m4	2018-05-31 08:54:48.293856600 +0300
-@@ -33,7 +33,7 @@
-        [case "$host_os" in
-           # Guess yes on platforms where we know the result.
-           *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \
--          | hpux* | solaris* | cygwin* | mingw*)
-+          | hpux* | solaris* | cygwin* | msys* | mingw*)
-             ac_cv_func_realloc_0_nonnull="guessing yes" ;;
-           # If we don't know, assume the worst.
-           *) ac_cv_func_realloc_0_nonnull="guessing no" ;;
 diff -Naur bison-3.0.5-orig/m4/threadlib.m4 bison-3.0.5/m4/threadlib.m4
 --- bison-3.0.5-orig/m4/threadlib.m4	2018-05-08 13:02:50.000000000 +0300
 +++ bison-3.0.5/m4/threadlib.m4	2018-05-31 08:49:39.446227300 +0300