bison 3.8.2: prefer configure argument over patch

* PKGBUILD:
  - remove references to gnulib-weak.patch
  - build: add 'gl_cv_have_weak=no' as argument to configure overriding
           the result of the relevant gnulib test
* gnulib-weak.patch: removed
This commit is contained in:
Jannick 2023-07-21 08:03:34 +02:00
parent ce7b339f4e
commit 85bbd78467
2 changed files with 6 additions and 21 deletions

View File

@ -2,7 +2,7 @@
pkgname=bison pkgname=bison
pkgver=3.8.2 pkgver=3.8.2
pkgrel=4 pkgrel=5
pkgdesc="The GNU general-purpose parser generator" pkgdesc="The GNU general-purpose parser generator"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
license=('spdx:GPL-3.0-or-later') license=('spdx:GPL-3.0-or-later')
@ -10,18 +10,14 @@ url="https://www.gnu.org/software/bison/bison.html"
depends=('m4' 'sh' 'libiconv' 'libintl') depends=('m4' 'sh' 'libiconv' 'libintl')
options=('staticlibs') options=('staticlibs')
makedepends=('flex' 'autotools' 'gcc' 'gettext-devel' 'libiconv-devel') makedepends=('flex' 'autotools' 'gcc' 'gettext-devel' 'libiconv-devel')
source=(https://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig} source=(https://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig})
gnulib-weak.patch)
sha256sums=('9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2' sha256sums=('9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2'
'SKIP' 'SKIP')
'337d84e29c9e2b5deb941cca0e4fe097f644b8ff801daae48384cb217465bd1a')
validpgpkeys=('7DF84374B1EE1F9764BBE25D0DDCAA3278D5264E') # Akim Demaille <akim.demaille@gmail.com> validpgpkeys=('7DF84374B1EE1F9764BBE25D0DDCAA3278D5264E') # Akim Demaille <akim.demaille@gmail.com>
prepare() { prepare() {
cd ${srcdir}/${pkgname}-${pkgver} cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 -i ${srcdir}/gnulib-weak.patch
autoreconf -vfi autoreconf -vfi
} }
@ -29,9 +25,10 @@ build() {
cd ${srcdir}/${pkgname}-${pkgver} cd ${srcdir}/${pkgname}-${pkgver}
local CYGWIN_CHOST="${CHOST/-msys/-cygwin}" local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
./configure \ ./configure -C \
--build=${CYGWIN_CHOST} \ --build=${CYGWIN_CHOST} \
--prefix=/usr --prefix=/usr \
gl_cv_have_weak=no
make make
} }

View File

@ -1,12 +0,0 @@
--- bison-3.0.5/m4/threadlib.m4.orig 2021-12-29 09:21:24.516000000 +0100
+++ bison-3.0.5/m4/threadlib.m4 2021-12-29 09:21:40.882799400 +0100
@@ -101,6 +101,9 @@
#pragma weak fputs
int main ()
{
+#ifdef __CYGWIN__
+ return 1;
+#endif
return (fputs == NULL);
}]])],
[gl_cv_have_weak=yes],