Makefile.am

@@ -65,10 +65,9 @@ EXTRA_DIST += \
 	extras/tools/bison-macOS-7df04f9.patch \
 	extras/tools/bison-macOS-c41f233c.patch \
 	extras/tools/cmake-enable-ALPN-support-on-macOS-10.14.patch \
-	extras/tools/libtool-2.4.6-bitcode.patch \
-	extras/tools/libtool-2.4.6-clang-libs.patch \
-	extras/tools/libtool-2.4.6-response-files.patch \
-	extras/tools/libtool-2.4.6-san.patch \
+	extras/tools/libtool-2.4.7-bitcode.patch \
+	extras/tools/libtool-2.4.7-clang-libs.patch \
+	extras/tools/libtool-2.4.7-response-files.patch \
 	extras/tools/ragel-6.8-javacodegen.patch
 
 ###############################################################################

extras/tools/SHA512SUMS

 3954a6ad3f522c135f327ba0d376eb16ae42103849c8cc5cd6c8c6e87b8c5433c95a0f2d4dfa3e6c2705ee0b8996e5b27d0b2248f64a05fc8c902116cc45a7b2  apache-ant-1.9.7.tar.bz2
-e34c7818bcde14d2cb13cdd293ed17d70740d4d1fd7c67a07b415491ef85d42f450d4fe5f8f80cc330bf75c40a62774c51a4336e06e8da07a4cbc49922d975ee  autoconf-2.69.tar.gz
-47b0120a59e3e020529a6ce750297d7de1156fd2be38db5d101e50120f11b40c28741ecd5eacf2790a9e25386713dcf7717339cfa5d7943d0dbf47c417383448  automake-1.16.1.tar.gz
+248cdcc9b3ee315f1508518a8edb02e891646d990ef4fc4e5444950c397f5c91e87ca3947269dc5e0de36b051914e118c66d293f2f3f0de24403d9f2ede0ece4  automake-1.16.5.tar.gz
 f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c49638c37f0502ea0a2d8da0f9098805f11088ba7b299bf72a  cmake-3.17.0.tar.gz
 9953413376c6b33e9e49d1f4f5b2d50075e0b1defb17b3c233d186d21416e6b607df11f6030588eeec3b025e1075c9c37a3db3c872fc22329d1dc0d0c6e2d9d0  gas-preprocessor-72887b9.tar.gz
-3233d81cb2739a54b840a0a82064eebbfaa4fb442fb993a35d6bd41d8395c51f038c90ae048b9252f172d0a5bbfb4b36e2b13d4477001f9ff7d4124237819a18  libtool-2.4.6.tar.gz
-29254dd4267a093e8d9da3a26df8b02564044cdb4506be539ec1aff4e5d406477bcf32f5e813c840f3aec77293bfe2cdde18f6a21724a7e0bfff646ec88b74ae  m4-1.4.18.tar.gz
+2bc5331f9807da8754b2ee623a30299cc0d103d6f98068a4c22263aab67ff148b7ad3a1646bd274e604bc08a8ef0ac2601e6422e641ad0cfab2222d60a58c5a8  autoconf-2.71.tar.gz
+f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2  m4-1.4.19.tar.gz
 56a9656539448972bc3080357ccc987bd4cbca3847758fe41251eb8af1a5e403a75f38d1344fa2c0bd56de880f37f3eaafbe7116c506f33331e7a8dd8a53cf2a  pkg-config-0.28-1.tar.gz
 9f85a98e55cbc9f245a3079d5a597f778454bc945f0942cb10fbdfbde5fe12b17d6dda93d6a8d5281459ad30a3840be7e0712feb33a824226884e7e4da54a061  protobuf-3.1.0.tar.gz
 6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38  ragel-6.10.tar.gz
@@ -18,3 +17,4 @@ e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdb
 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942  help2man-1.47.6.tar.xz
 3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514  meson-0.56.2.tar.gz
 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2  ninja-1.8.2.tar.gz
+27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385  libtool-2.4.7.tar.gz

extras/tools/bootstrap

@@ -22,15 +22,15 @@ check_version() {
     gotver=$2
     gotmajor=`echo $gotver|cut -d. -f1`
     gotminor=`echo $gotver|cut -d. -f2`
-    gotmicro=`echo $gotver|cut -d. -f3`
+    gotmicro=`echo $gotver|cut -d. -f3|tr -c -d '[:digit:]'`
     [ -z "$gotmicro" ] && gotmicro=0
     needmajor=`echo $3|cut -d. -f1`
     needminor=`echo $3|cut -d. -f2`
     needmicro=`echo $3|cut -d. -f3`
     [ -z "$needmicro" ] && needmicro=0
-    if [ "$needmajor" -ne "$gotmajor" \
-         -o "$needmajor" -eq "$gotmajor" -a "$needminor" -gt "$gotminor" \
-         -o "$needmajor" -eq "$gotmajor" -a "$needminor" -eq "$gotminor" -a "$needmicro" -gt "$gotmicro" ]
+    if [ "$needmajor" -ne "$gotmajor" ] ||
+       [ "$needmajor" -eq "$gotmajor" -a "$needminor" -gt "$gotminor" ] ||
+       [ "$needmajor" -eq "$gotmajor" -a "$needminor" -eq "$gotminor" -a "$needmicro" -gt "$gotmicro" ];
     then
         echo "$1 too old"
         NEEDED="$NEEDED $1"

extras/tools/libtool-2.4.6-san.patch

-From a5c6466528c060cc4660ad0319c00740db0e42ba Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
-Date: Sun, 18 Oct 2015 21:55:39 -0700
-Subject: libtool: fix GCC/clang linking with -fsanitize=*
-
-References:
-https://lists.gnu.org/archive/html/libtool/2014-04/msg00026.html
-
-* build-aux/ltmain.in (func_mode_link): Pass -fsanitize=* to the
-linker to allow trivial use of the clang address sanitizer.
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
-Copyright-paperwork-exempt: Yes
----
---- libtool-2.4.6/build-aux/ltmain.in.orig	2019-03-06 17:24:29.400776100 +0100
-+++ libtool-2.4.6/build-aux/ltmain.in	2019-03-06 17:26:31.994381100 +0100
-@@ -5361,9 +5361,10 @@
-       # --sysroot=*          for sysroot support
-       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       # -stdlib=*            select c++ std lib with clang
-+      # -fsanitize=*         Clang/GCC memory and address sanitizer
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-fsanitize=*)
-         func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
-         func_append compile_command " $arg"
---- libtool-2.4.6/build-aux/ltmain.sh.orig	2019-03-06 17:25:38.610781500 +0100
-+++ libtool-2.4.6/build-aux/ltmain.sh	2019-03-06 17:26:53.790387700 +0100
-@@ -7273,9 +7273,10 @@
-       # --sysroot=*          for sysroot support
-       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       # -stdlib=*            select c++ std lib with clang
-+      # -fsanitize=*         Clang/GCC memory and address sanitizer
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-fsanitize=*)
-         func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
-         func_append compile_command " $arg"

extras/tools/libtool-2.4.6-bitcode.patch → extras/tools/libtool-2.4.7-bitcode.patch

@@ -17,22 +17,3 @@
  	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
  	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
  	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
---- libtool-2.4.6/build-aux/ltmain.sh.orig	2019-03-06 17:18:05.690203200 +0100
-+++ libtool-2.4.6/build-aux/ltmain.sh	2019-03-06 17:21:40.825606300 +0100
-@@ -10208,16 +10208,6 @@
- 
-       case $host in
-       *-*-darwin*)
--	# Don't allow lazy linking, it breaks C++ global constructors
--	# But is supposedly fixed on 10.4 or later (yay!).
--	if test CXX = "$tagname"; then
--	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
--	    10.[0123])
--	      func_append compile_command " $wl-bind_at_load"
--	      func_append finalize_command " $wl-bind_at_load"
--	    ;;
--	  esac
--	fi
- 	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
- 	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`

extras/tools/libtool-2.4.7-embed-bitcode.patch

+From 019e9ec253a972fd5b0e3675140256b0982ec6f4 Mon Sep 17 00:00:00 2001
+From: Alexandre Janniaux <ajanni@videolabs.io>
+Date: Mon, 31 May 2021 10:28:54 +0200
+Subject: [PATCH] ltmain: add support for -fembed-bitcode
+
+---
+ build-aux/ltmain.in | 1 +
+ m4/libtool.m4       | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+index 8ef537c1..d8131598 100644
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -5197,6 +5197,7 @@ func_mode_link ()
+ 	continue
+ 	;;
+       -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
++      |-fembed-bitcode|-fembed-bitcode-marker \
+       |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ 	func_append compiler_flags " $arg"
+ 	func_append compile_command " $arg"
+diff --git a/m4/libtool.m4 b/m4/libtool.m4
+index 69cd577d..da0eec54 100644
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -1122,9 +1122,9 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+   if test yes = "$_lt_dar_can_shared"; then
+     output_verbose_link_cmd=func_echo_all
+     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
++    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -dynamiclib \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+     _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+-    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
++    _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -dynamiclib \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+     m4_if([$1], [CXX],
+ [   if test yes != "$lt_cv_apple_cc_single_mod"; then
+       _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+-- 
+2.36.0
+

extras/tools/libtool-2.4.7-lpthread.patch

+From 7151ed6928f66d8ecd5a57d9db2b08f4fcc8f647 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
+Date: Mon, 2 Aug 2021 17:42:38 +0200
+Subject: [PATCH] Force -lpthread when -nostdlib is provided to the C++ Gnu
+ linker
+
+-nostdlib will be provided, which makes -pthread not imply -lpthread by
+design
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
+---
+ build-aux/ltmain.in | 8 ++++++++
+ m4/libtool.m4       | 5 +++++
+ 2 files changed, 13 insertions(+)
+
+diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+index 96b37003..9f3a3d6f 100644
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -5183,6 +5183,14 @@ func_mode_link ()
+ 	    *" $arg "*) ;;
+ 	    * ) func_append new_inherited_linker_flags " $arg" ;;
+ 	esac
++    case $arg in
++      -pthread|-pthreads)
++        if test -n "$hardcode_lpthread" &&
++          test yes = "$hardcode_lpthread"; then
++          func_append new_inherited_linker_flags " -lpthread"
++        fi
++      ;;
++    esac
+ 	continue
+ 	;;
+ 
+diff --git a/m4/libtool.m4 b/m4/libtool.m4
+index f2d1f398..221ee689 100644
+--- a/m4/libtool.m4
++++ b/m4/libtool.m4
+@@ -6207,6 +6207,8 @@ _LT_TAGDECL([], [postlink_cmds], [2],
+     [Commands necessary for finishing linking programs])
+ _LT_TAGDECL([], [file_list_spec], [1],
+     [Specify filename containing input files])
++_LT_TAGDECL([], [hardcode_lpthread], [0],
++    [Force -lpthread even when -ptherad is specified])
+ dnl FIXME: Not yet implemented
+ dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+ dnl    [Compiler flag to generate thread safe objects])
+@@ -6343,6 +6345,7 @@ _LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+ _LT_TAGVAR(no_undefined_flag, $1)=
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++_LT_TAGVAR(hardcode_lpthread, $1)=no
+ 
+ # Source file extension for C++ test sources.
+ ac_ext=cpp
+@@ -6417,6 +6420,8 @@ if test yes != "$_lt_caught_CXX_error"; then
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+         _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ 
++        _LT_TAGVAR(hardcode_lpthread, $1)='yes'
++
+         # If archive_cmds runs LD, not CC, wlarc should be empty
+         # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+         #     investigate it a little bit more. (MM)
+-- 
+2.30.2
+

extras/tools/libtool-2.4.6-response-files.patch → extras/tools/libtool-2.4.7-response-files.patch

@@ -8,14 +8,14 @@ lld (impersonating GNU ld) only supports response files, not
 linker scripts. Using a linker script as input just to pass a
 list of files is overkill for cases when a response file is enough.
 ---
- libtool-2.4.6/config/ltmain.m4sh | 28 ++++++++++++++--------------
+ libtool-2.4.6/build-aux/ltmain.in | 28 ++++++++++++++--------------
  libtool-2.4.6/m4/libtool.m4      |  2 ++
  2 files changed, 16 insertions(+), 14 deletions(-)
 
-diff --git libtool-2.4.6/build-aux/ltmain.sh.orig libtool-2.4.6/build-aux/ltmain.sh
+diff --git libtool-2.4.6/build-aux/ltmain.in.orig libtool-2.4.6/build-aux/ltmain.in
 index 2641327..f6b4217 100644
---- libtool-2.4.6/build-aux/ltmain.sh.orig	2019-05-14 15:41:21.977391100 +0200
-+++ libtool-2.4.6/build-aux/ltmain.sh	2019-05-14 15:43:07.767697900 +0200
+--- libtool-2.4.6/build-aux/ltmain.in.orig	2019-05-14 15:41:21.977391100 +0200
++++ libtool-2.4.6/build-aux/ltmain.in	2019-05-14 15:43:07.767697900 +0200
 @@ -9852,20 +9852,7 @@ EOF
  	  last_robj=
  	  k=1

extras/tools/packages.mak

@@ -12,16 +12,16 @@ NASM_URL=http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_V
 CMAKE_VERSION=3.17.0
 CMAKE_URL=http://www.cmake.org/files/v3.17/cmake-$(CMAKE_VERSION).tar.gz
 
-LIBTOOL_VERSION=2.4.6
+LIBTOOL_VERSION=2.4.7
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
 
-AUTOCONF_VERSION=2.69
+AUTOCONF_VERSION=2.71
 AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.gz
 
-AUTOMAKE_VERSION=1.16.1
+AUTOMAKE_VERSION=1.16.5
 AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
 
-M4_VERSION=1.4.18
+M4_VERSION=1.4.19
 M4_URL=$(GNU)/m4/m4-$(M4_VERSION).tar.gz
 
 PKGCFG_VERSION=0.28-1

extras/tools/tools.mak

@@ -9,14 +9,14 @@ TARBALLS := $(TOOLS)
 # common rules
 #
 
-ifeq ($(shell curl --version >/dev/null 2>&1 || echo FAIL),)
+ifeq ($(shell command -v curl >/dev/null 2>&1 || echo FAIL),)
 download = curl -f -L -- "$(1)" > "$@.tmp" && touch $@.tmp && mv $@.tmp $@
-else ifeq ($(shell wget --version >/dev/null 2>&1 || echo FAIL),)
+else ifeq ($(shell command -v wget >/dev/null 2>&1 || echo FAIL),)
 download = rm -f $@.tmp && \
 	wget --passive -c -p -O $@.tmp "$(1)" && \
 	touch $@.tmp && \
 	mv $@.tmp $@
-else ifeq ($(which fetch >/dev/null 2>&1 || echo FAIL),)
+else ifeq ($(shell command -v fetch >/dev/null 2>&1 || echo FAIL),)
 download = rm -f $@.tmp && \
 	fetch -p -o $@.tmp "$(1)" && \
 	touch $@.tmp && \
@@ -25,11 +25,11 @@ else
 download = $(error Neither curl nor wget found!)
 endif
 
-ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),)
-SHA512SUM = sha512sum --check
-else ifeq ($(shell shasum --version >/dev/null 2>&1 || echo FAIL),)
+ifeq ($(shell command -v sha512sum >/dev/null 2>&1 || echo FAIL),)
+SHA512SUM = sha512sum -c
+else ifeq ($(shell command -v shasum >/dev/null 2>&1 || echo FAIL),)
 SHA512SUM = shasum -a 512 --check
-else ifeq ($(shell openssl version >/dev/null 2>&1 || echo FAIL),)
+else ifeq ($(shell command -v openssl >/dev/null 2>&1 || echo FAIL),)
 SHA512SUM = openssl dgst -sha512
 else
 SHA512SUM = $(error SHA-512 checksumming not found!)
@@ -127,10 +127,11 @@ libtool-$(LIBTOOL_VERSION).tar.gz:
 libtool: libtool-$(LIBTOOL_VERSION).tar.gz
 	$(UNPACK)
 	(cd $(UNPACK_DIR) && chmod u+w build-aux/ltmain.sh)
-	$(APPLY) $(TOOLS)/libtool-2.4.6-bitcode.patch
-	$(APPLY) $(TOOLS)/libtool-2.4.6-san.patch
-	$(APPLY) $(TOOLS)/libtool-2.4.6-clang-libs.patch
-	$(APPLY) $(TOOLS)/libtool-2.4.6-response-files.patch
+	$(APPLY) $(TOOLS)/libtool-2.4.7-bitcode.patch
+	$(APPLY) $(TOOLS)/libtool-2.4.7-clang-libs.patch
+	$(APPLY) $(TOOLS)/libtool-2.4.7-response-files.patch
+	$(APPLY) $(TOOLS)/libtool-2.4.7-lpthread.patch
+	$(APPLY) $(TOOLS)/libtool-2.4.7-embed-bitcode.patch
 	$(MOVE)
 
 .buildlibtool: libtool .automake .help2man
@@ -220,8 +221,6 @@ m4-$(M4_VERSION).tar.gz:
 
 m4: m4-$(M4_VERSION).tar.gz
 	$(UNPACK)
-	$(APPLY) $(TOOLS)/bison-macOS-c41f233c.patch
-	$(APPLY) $(TOOLS)/bison-macOS-7df04f9.patch
 	$(MOVE)
 
 .buildm4: m4