[arch-commits] Commit in bison/repos (6 files)

[Allan McRae]

    Date: Tuesday, November 29, 2011 @ 07:24:18
  Author: allan
Revision: 143797

db-move: moved bison from [testing] to [core] (i686)

Added:
  bison/repos/core-i686/PKGBUILD
    (from rev 143796, bison/repos/testing-i686/PKGBUILD)
  bison/repos/core-i686/bison-2.5-undefined-reference.patch
    (from rev 143796, bison/repos/testing-i686/bison-2.5-undefined-reference.patch)
  bison/repos/core-i686/bison.install
    (from rev 143796, bison/repos/testing-i686/bison.install)
Deleted:
  bison/repos/core-i686/PKGBUILD
  bison/repos/core-i686/bison.install
  bison/repos/testing-i686/

-------------------------------------+
 PKGBUILD                            |   72 ++++++++++++++++++----------------
 bison-2.5-undefined-reference.patch |   11 +++++
 bison.install                       |   32 +++++++--------
 3 files changed, 66 insertions(+), 49 deletions(-)

Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2011-11-29 12:02:45 UTC (rev 143796)
+++ core-i686/PKGBUILD	2011-11-29 12:24:18 UTC (rev 143797)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <allan at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-
-pkgname=bison
-pkgver=2.5
-pkgrel=2
-pkgdesc="The GNU general-purpose parser generator"
-arch=('i686' 'x86_64')
-license=('GPL3')
-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})
-md5sums=('9dba20116b13fc61a0846b0058fbe004'
-         '610b73db67bd4760209458efe7554ca3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --datadir=/usr/share
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}

Copied: bison/repos/core-i686/PKGBUILD (from rev 143796, bison/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD	                        (rev 0)
+++ core-i686/PKGBUILD	2011-11-29 12:24:18 UTC (rev 143797)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+
+pkgname=bison
+pkgver=2.5
+pkgrel=3
+pkgdesc="The GNU general-purpose parser generator"
+arch=('i686' 'x86_64')
+license=('GPL3')
+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}
+        bison-2.5-undefined-reference.patch)
+md5sums=('9dba20116b13fc61a0846b0058fbe004'
+         '610b73db67bd4760209458efe7554ca3'
+         '2015c5421b2ad99032154f27bf5c4772')
+
+build() {
+  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}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}

Copied: bison/repos/core-i686/bison-2.5-undefined-reference.patch (from rev 143796, bison/repos/testing-i686/bison-2.5-undefined-reference.patch)
===================================================================
--- core-i686/bison-2.5-undefined-reference.patch	                        (rev 0)
+++ core-i686/bison-2.5-undefined-reference.patch	2011-11-29 12:24:18 UTC (rev 143797)
@@ -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 *);
+ 

Deleted: core-i686/bison.install
===================================================================
--- core-i686/bison.install	2011-11-29 12:02:45 UTC (rev 143796)
+++ core-i686/bison.install	2011-11-29 12:24:18 UTC (rev 143797)
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file=bison.info.gz
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-}

Copied: bison/repos/core-i686/bison.install (from rev 143796, bison/repos/testing-i686/bison.install)
===================================================================
--- core-i686/bison.install	                        (rev 0)
+++ core-i686/bison.install	2011-11-29 12:24:18 UTC (rev 143797)
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file=bison.info.gz
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info $infodir/$file $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+}