From 13b95b59fed6dae595f5d55b7e6e77fe9c12e9f6 Mon Sep 17 00:00:00 2001
From: Luka Perkov <luka@openwrt.org>
Date: Tue, 24 Sep 2013 20:01:02 +0000
Subject: [PATCH] [tools] bison: update to 3.0

Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38169 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 tools/bison/Makefile                          |  4 ++--
 tools/bison/patches/000-relocatable.patch     | 20 -------------------
 .../bison/patches/100-fix-gets-removal.patch  |  2 +-
 3 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 tools/bison/patches/000-relocatable.patch

diff --git a/tools/bison/Makefile b/tools/bison/Makefile
index d20d1c03c4..3909ec3313 100644
--- a/tools/bison/Makefile
+++ b/tools/bison/Makefile
@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bison
-PKG_VERSION:=2.7
+PKG_VERSION:=3.0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_MD5SUM:=234cdfac99257cf99ac4a03c898f37b9
+PKG_MD5SUM:=a2624994561aa69f056c904c1ccb2880
 PKG_CAT:=xzcat
 
 HOST_BUILD_PARALLEL:=1
diff --git a/tools/bison/patches/000-relocatable.patch b/tools/bison/patches/000-relocatable.patch
deleted file mode 100644
index 47c0ae8bae..0000000000
--- a/tools/bison/patches/000-relocatable.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -81,6 +81,7 @@ MOSTLYCLEANFILES = yacc
- 
- yacc:
- 	$(AM_V_GEN)echo '#! /bin/sh' >$@
-+	$(AM_V_at)echo 'test -n "$$STAGING_DIR" && exec "$$STAGING_DIR/../host/bin/bison" -y "$$@"' >>$@
- 	$(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
- 	$(AM_V_at)chmod a+x $@
- 
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -1919,6 +1919,7 @@ uninstall-am: uninstall-binPROGRAMS unin
- 
- yacc:
- 	$(AM_V_GEN)echo '#! /bin/sh' >$@
-+	$(AM_V_at)echo 'test -n "$$STAGING_DIR" && exec "$$STAGING_DIR/../host/bin/bison" -y "$$@"' >>$@
- 	$(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
- 	$(AM_V_at)chmod a+x $@
- 
diff --git a/tools/bison/patches/100-fix-gets-removal.patch b/tools/bison/patches/100-fix-gets-removal.patch
index 169bfd673a..e0d5e34391 100644
--- a/tools/bison/patches/100-fix-gets-removal.patch
+++ b/tools/bison/patches/100-fix-gets-removal.patch
@@ -1,6 +1,6 @@
 --- a/lib/stdio.in.h
 +++ b/lib/stdio.in.h
-@@ -704,13 +704,6 @@ _GL_WARN_ON_USE (getline, "getline is un
+@@ -705,13 +705,6 @@ _GL_WARN_ON_USE (getline, "getline is un
  # endif
  #endif