gnu: graphite2: Use same linker settings for the Hurd as on Linux.

* gnu/packages/patches/graphite2-non-linux.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/fontutils.scm (graphite2):
[#:phases] Add phase to apply patch for Hurd targets.
[#:test-exclude] Remove.

Change-Id: I1146adc1daa1cc8400d00456ed2eb65a7ce95c6c
Signed-off-by: Gabriel Wicki <gabriel@erlikon.ch>

1 files changed, 12 insertions, 3 deletions

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 6a32294c7f1..41be890bf06 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -1690,9 +1690,18 @@ translated keywords and acts.")
    (inputs
     (list freetype))
    (arguments
-    (if (system-hurd?)
-        (list #:test-exclude "awamicmp3")
-        '()))
+    (list
+     #:phases
+     (if (target-hurd?)
+         #~(modify-phases %standard-phases
+             (add-after 'unpack 'apply-patch
+               (lambda _
+                 ;; use same linker settings as on linux
+                 ;; harfbuzz complains about being linked against libstdc++
+                 (let ((patch #$(local-file
+                                 (search-patch "graphite2-non-linux.patch"))))
+                   (invoke "patch" "--force" "-p1" "-i" patch)))))
+         #~%standard-phases)))
    (synopsis "Reimplementation of the SIL Graphite text processing engine")
    (description
     "Graphite2 is a reimplementation of the SIL Graphite text processing