guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/04: gnu: stringtie: Remove typedef conflict.


From: Ricardo Wurmus
Subject: 03/04: gnu: stringtie: Remove typedef conflict.
Date: Thu, 30 Mar 2017 04:04:42 -0400 (EDT)

rekado pushed a commit to branch core-updates
in repository guix.

commit 0d2c0562b86c70e409df53b6013d2835781a673b
Author: Ricardo Wurmus <address@hidden>
Date:   Thu Mar 30 10:22:21 2017 +0200

    gnu: stringtie: Remove typedef conflict.
    
    * gnu/packages/bioinformatics.scm (stringtie)[arguments]: Remove conflicting
    typedef in a new build phase "remove-duplicate-typedef".
---
 gnu/packages/bioinformatics.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 232c7db..1bba270 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -5210,6 +5210,13 @@ against local background noises.")
                (("#include \"(bam|sam|kstring).h\"" _ header)
                 (string-append "#include <samtools/" header ".h>")))
              #t))
+         (add-after 'unpack 'remove-duplicate-typedef
+           (lambda _
+             ;; This typedef conflicts with the typedef in
+             ;; glibc-2.25/include/bits/types.h
+             (substitute* "gclib/GThreads.h"
+               (("typedef long long __intmax_t;") ""))
+             #t))
          (replace 'install
           (lambda* (#:key outputs #:allow-other-keys)
             (let ((bin (string-append (assoc-ref outputs "out") "/bin/")))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]