From 6ce5a6c2e34d5053fcd02883059ea16ca2ad5a75 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Wed, 14 Sep 2022 14:48:46 +0200
Subject: gnu: antlr4: Update to 4.10.1.

* gnu/packages/java.scm (java-antlr4-runtime): Update to 4.10.1.
[source](patches): Remove obsolete patch.
(java-antlr4-runtime-cpp): Add #:configure-flags.
(antlr4)[arguments]: Don't run tests from removed directory.  Enable one test;
exclude one file.
* gnu/packages/fontutils.scm (python-afdko)[arguments]: Add phase to build
with the C++ 17 standard.
---
 gnu/packages/fontutils.scm | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'gnu/packages/fontutils.scm')

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index cf9c0d0a3c..3806d78b1e 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -164,6 +164,12 @@ them as it goes.")
      (list
       #:phases
       #~(modify-phases %standard-phases
+          (add-after 'unpack 'use-c++17
+            (lambda _
+              ;; ANTLR4 4.10 and later require C++ 17.
+              (substitute* "CMakeLists.txt"
+                (("CMAKE_CXX_STANDARD 11")
+                 "CMAKE_CXX_STANDARD 17"))))
           (add-after 'unpack 'use-system-libxml2
             (lambda _
               ;; XXX: These horrifying substitutions revert this upstream
-- 
cgit 1.4.1