From a9c958b5aa55a729a1530b2e23e088bb982f696c Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 9 Oct 2016 23:10:04 +0300
Subject: gnu: gcj: Switch dejagnu test command.

* gnu/packages/gcc.scm (gcj)[arguments]: Switch the depreciated dejagnu
command 'absolute' for the new testing command 'file normalize'.
---
 gnu/packages/gcc.scm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'gnu')

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 3880cab52b..c961c84fca 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -558,6 +558,13 @@ (define-public gcj
                  (string-append line " -Wl,-rpath=$(libdir)"))
                 (("libgcj(_bc)?_la_LDFLAGS =" ldflags _)
                  (string-append ldflags " -Wl,-rpath=$(libdir)")))))
+           (add-after
+            'unpack 'patch-testsuite
+            ;; dejagnu-1.6 removes the 'absolute' command
+            (lambda _
+              (substitute* "libjava/testsuite/lib/libjava.exp"
+                (("absolute") "file normalize"))
+              #t))
            (add-after
             'install 'install-javac-and-javap-wrappers
             (lambda _
-- 
cgit v1.2.3