diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-01 11:08:57 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-01 11:08:57 -0300 |
| commit | 1200fd46a32625f2ac4b035653cb49c22cce6426 (patch) | |
| tree | 0723ee124b40e6e95200ca002f9ae81361ab7919 /core/bison | |
| parent | 0d0d9e0930114504c15aa8174e2c7d1d2b7a6744 (diff) | |
| parent | fd115d7057eb8243df6edfaf1ed440d6f3e70692 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/iat/PKGBUILD
community/libnsbmp/PKGBUILD
community/libnsgif/PKGBUILD
community/libopenraw/PKGBUILD
community/netsurf/PKGBUILD
core/bison/PKGBUILD
core/perl/PKGBUILD
extra/avahi/PKGBUILD
extra/mutt/PKGBUILD
extra/php/PKGBUILD
Diffstat (limited to 'core/bison')
| -rw-r--r-- | core/bison/PKGBUILD | 22 | ||||
| -rw-r--r-- | core/bison/bison-2.5-undefined-reference.patch | 11 |
2 files changed, 25 insertions, 8 deletions
diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index 6c43b3a39..b3a32e418 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142169 2011-11-05 11:41:16Z allan $ +# $Id: PKGBUILD 143798 2011-11-29 12:24:20Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison pkgver=2.5 -pkgrel=2.1 +pkgrel=3 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -12,22 +12,28 @@ url="http://www.gnu.org/software/bison/bison.html" depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install -source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2{,.sig}) +source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2{,.sig} + bison-2.5-undefined-reference.patch) md5sums=('9dba20116b13fc61a0846b0058fbe004' - '610b73db67bd4760209458efe7554ca3') + '610b73db67bd4760209458efe7554ca3' + '2015c5421b2ad99032154f27bf5c4772') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} + + # workaround for FS#26794 + patch -Np1 -i $srcdir/bison-2.5-undefined-reference.patch + ./configure --prefix=/usr --datadir=/usr/share make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } diff --git a/core/bison/bison-2.5-undefined-reference.patch b/core/bison/bison-2.5-undefined-reference.patch new file mode 100644 index 000000000..ea390259e --- /dev/null +++ b/core/bison/bison-2.5-undefined-reference.patch @@ -0,0 +1,11 @@ +diff -Naur bison-2.5-orig/lib/yyerror.c bison-2.5/lib/yyerror.c +--- bison-2.5-orig/lib/yyerror.c 2011-01-04 00:50:42.000000000 +1000 ++++ bison-2.5/lib/yyerror.c 2011-11-09 22:01:48.725507079 +1000 +@@ -18,6 +18,7 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + + #include <stdio.h> ++#undef fprintf + + int yyerror (char const *); + |