From: Daniel Engberg <daniel.engberg.lists@pyret.net>
Date: Sun, 10 Feb 2019 12:16:30 +0000 (+0000)
Subject: tools/bison: Update to 3.3.2
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a3383e4b016478c73cf149ae7f42ad8f9b87ffbb;p=openwrt%2Fstaging%2Fblocktrron.git

tools/bison: Update to 3.3.2

Update bison to 3.3.2
Enable pthreads support
Refresh patches

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
---

diff --git a/tools/bison/Makefile b/tools/bison/Makefile
index 139dbc763b..2dcbe617af 100644
--- a/tools/bison/Makefile
+++ b/tools/bison/Makefile
@@ -7,16 +7,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bison
-PKG_VERSION:=3.2.4
+PKG_VERSION:=3.3.2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=523d44419f4df68286503740c95c7b3400b748d7d8b797209195ee5d67f05634
+PKG_HASH:=039ee45b61d95e5003e7e8376f9080001b4066ff357bde271b7faace53b9d804
 
 HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
 
+HOST_CONFIGURE_ARGS += --enable-threads=pth
+
 define Host/Clean
 	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
 	$(call Host/Clean/Default)
diff --git a/tools/bison/patches/010-intl-stub-compat.patch b/tools/bison/patches/010-intl-stub-compat.patch
index d2dfcadbab..8108c53c61 100644
--- a/tools/bison/patches/010-intl-stub-compat.patch
+++ b/tools/bison/patches/010-intl-stub-compat.patch
@@ -1,15 +1,13 @@
 --- a/src/main.c
 +++ b/src/main.c
-@@ -60,9 +60,9 @@ main (int argc, char *argv[])
- {
-   set_program_name (argv[0]);
-   setlocale (LC_ALL, "");
--  (void) bindtextdomain (PACKAGE, LOCALEDIR);
--  (void) bindtextdomain ("bison-runtime", LOCALEDIR);
--  (void) textdomain (PACKAGE);
-+  bindtextdomain (PACKAGE, LOCALEDIR);
-+  bindtextdomain ("bison-runtime", LOCALEDIR);
-+  textdomain (PACKAGE);
- 
+@@ -66,8 +66,8 @@ main (int argc, char *argv[])
    {
-     char const *cp = getenv ("LC_CTYPE");
+     char *cp = NULL;
+     char const *localedir = relocate2 (LOCALEDIR, &cp);
+-    (void) bindtextdomain (PACKAGE, localedir);
+-    (void) bindtextdomain ("bison-runtime", localedir);
++    bindtextdomain (PACKAGE, localedir);
++    bindtextdomain ("bison-runtime", localedir);
+     free (cp);
+   }
+   (void) textdomain (PACKAGE);