[PATCH 0/1] Fix OpenEXR on i686, dependency of LibreOffice

[PATCH 0/1] Fix OpenEXR on i686, dependency of LibreOffice

[Leo Famulari]

Currently, OpenEXR fails to build on i686 due to a test failure. This
breaks LibreOffice on that platform, too.

According to this upstream bug report, it is safe to disable the test in
question:
https://github.com/openexr/openexr/issues/67#issuecomment-21169748

So, here's a patch making that change.

Thoughts?

Leo Famulari (1):
  gnu: openexr: Disable broken test to fix build on i686.

 gnu/packages/graphics.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

-- 
2.6.3

[PATCH 1/1] gnu: openexr: Disable broken test to fix build on i686.

[Leo Famulari]

* gnu/packages/graphics.scm (openexr)[arguments]: New field.
---
 gnu/packages/graphics.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index c022d74..3c5ad72 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -206,6 +206,20 @@ exception-handling library.")
                    "\"/tmp/\"")))
               (patches (list (search-patch "openexr-missing-samples.patch")))))
     (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (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:
+         ;; https://github.com/openexr/openexr/issues/67#issuecomment-21169748
+           (lambda _
+             (substitute* "IlmImfTest/main.cpp"
+               (("#include \"testOptimizedInterleavePatterns.h\"")
+                 "//#include \"testOptimizedInterleavePatterns.h\"")
+               (("TEST \\(testOptimizedInterleavePatterns")
+                 "//TEST (testOptimizedInterleavePatterns"))
+             #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (propagated-inputs
-- 
2.6.3

Re: [PATCH 1/1] gnu: openexr: Disable broken test to fix build on i686.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/packages/graphics.scm (openexr)[arguments]: New field.
> ---
>  gnu/packages/graphics.scm | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
>
> diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
> index c022d74..3c5ad72 100644
> --- a/gnu/packages/graphics.scm
> +++ b/gnu/packages/graphics.scm
> @@ -206,6 +206,20 @@ exception-handling library.")
>                     "\"/tmp/\"")))
>                (patches (list (search-patch "openexr-missing-samples.patch")))))
>      (build-system gnu-build-system)
> +    (arguments
> +     '(#:phases
> +       (modify-phases %standard-phases
> +         (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:
> +         ;; https://github.com/openexr/openexr/issues/67#issuecomment-21169748
> +           (lambda _

Better to indent the comment with “(lambda” below.

Otherwise LGTM, thanks for fixing this!

Ludo’.

Re: [PATCH 1/1] gnu: openexr: Disable broken test to fix build on i686.

[Leo Famulari]

On Fri, Mar 11, 2016 at 03:41:49PM +0100, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> 
> > * gnu/packages/graphics.scm (openexr)[arguments]: New field.
> > ---
> >  gnu/packages/graphics.scm | 14 ++++++++++++++
> >  1 file changed, 14 insertions(+)
> >
> > diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
> > index c022d74..3c5ad72 100644
> > --- a/gnu/packages/graphics.scm
> > +++ b/gnu/packages/graphics.scm
> > @@ -206,6 +206,20 @@ exception-handling library.")
> >                     "\"/tmp/\"")))
> >                (patches (list (search-patch "openexr-missing-samples.patch")))))
> >      (build-system gnu-build-system)
> > +    (arguments
> > +     '(#:phases
> > +       (modify-phases %standard-phases
> > +         (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:
> > +         ;; https://github.com/openexr/openexr/issues/67#issuecomment-21169748
> > +           (lambda _
> 
> Better to indent the comment with “(lambda” below.

Okay, pushed with that change!

> 
> Otherwise LGTM, thanks for fixing this!
> 
> Ludo’.