guix-commits
[Top][All Lists]
Advanced

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

03/03: gnu: openexr: Add IlmBase include sub-directory to 'OpenEXR.pc'.


From: Ludovic Courtès
Subject: 03/03: gnu: openexr: Add IlmBase include sub-directory to 'OpenEXR.pc'.
Date: Tue, 4 Apr 2017 18:59:32 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 01fe019166fe8a925b3bf3b489792b52b1b6ca7a
Author: Ludovic Courtès <address@hidden>
Date:   Wed Apr 5 00:44:45 2017 +0200

    gnu: openexr: Add IlmBase include sub-directory to 'OpenEXR.pc'.
    
    * gnu/packages/graphics.scm (openexr)[arguments]: Add
    'set-ilmbase-directory-in-pc-file' phase.
---
 gnu/packages/graphics.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index a502f24..79c7772 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2015 Tomáš Čech <address@hidden>
 ;;; Copyright © 2016 Leo Famulari <address@hidden>
 ;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
@@ -256,6 +256,20 @@ exception-handling library.")
     (arguments
      '(#:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'set-ilmbase-directory-in-pc-file
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Add '-I ILMBASE/include/OpenEXR' to 'OpenEXR.pc' since some of
+             ;; the headers of OpenEXR expect IlmBase headers to live in the
+             ;; same directory.  Unfortunately this doesn't help much because
+             ;; 'FindOpenEXR.cmake' doesn't read 'OpenEXR.pc'...
+             (let ((ilmbase (assoc-ref inputs "ilmbase")))
+               (substitute* "OpenEXR.pc.in"
+                 (("^Cflags: (.*)$" _ cflags)
+                  (string-append "Cflags: "
+                                 " -I" ilmbase "/include"
+                                 " -I" ilmbase "/include/OpenEXR "
+                                 cflags "\n")))
+               #t)))
          (add-after 'unpack 'disable-broken-test
            ;; This test fails on i686. Upstream developers suggest that
            ;; this test is broken on i686 and can be safely disabled:



reply via email to

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