01/02: gnu: lame: Build with gcc-4.8 on i686.

[Mark H. Weaver]

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

commit 194782a881fbcf6ac47122a0e85fbe5b69c6af58
Author: Mark H Weaver <address@hidden>
Date:   Sun Jun 21 14:08:39 2015 -0400

    gnu: lame: Build with gcc-4.8 on i686.
    
    * gnu/packages/mp3.scm (lame)[native-inputs]: When compiling natively on 
i686,
      add gcc-4.8.
---
 gnu/packages/mp3.scm |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index 55ab4b4..c7efbae 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -21,6 +21,8 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages cdrom)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gettext)
@@ -335,6 +337,12 @@ use with CD-recording software).")
               (base32
                "1zr3kadv35ii6liia0bpfgxpag27xcivp571ybckpbz4b10nnd14"))))
     (build-system gnu-build-system)
+    ;; XXX FIXME: Use gcc-4.8 on i686 to work around
+    ;; <http://bugs.gnu.org/20856>.
+    (native-inputs (if (and (not (%current-target-system))
+                            (string-prefix? "i686-" (%current-system)))
+                       `(("gcc" ,(canonical-package gcc-4.8)))
+                       '()))
     (home-page "http://lame.sourceforge.net/";)
     (synopsis "MPEG Audio Layer III (MP3) encoder")
     (description "LAME is a high quality MPEG Audio Layer III (MP3) encoder.")