[PATCH] withershins: use “libiberty” package

[PATCH] withershins: use “libiberty” package

[Ricardo Wurmus]

[-- Attachment #1: Type: text/plain, Size: 84 bytes --]

This patch depends on my previous patch adding a separate “libiberty”
package.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-withershins-Use-new-libiberty-package.patch --]
[-- Type: text/x-patch, Size: 2503 bytes --]

From 8f6dd7a290d32b154cc353b69373d5a0225d88e5 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 28 Jun 2015 10:22:45 +0200
Subject: [PATCH] gnu: withershins: Use new "libiberty" package.

* gnu/packages/code.scm (withershins)[inputs]: Replace "gcc" with "libiberty".
   [arguments]: Simplify "find-libiberty" phase.
---
 gnu/packages/code.scm | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 97261d6..b270c94 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -246,25 +246,17 @@ files, but compared to grep is much faster and respects files like .gitignore,
     (build-system cmake-build-system)
     (arguments
      `(#:out-of-source? #f
-       #:modules ((guix build utils)
-                  (guix build cmake-build-system)
-                  (ice-9 popen)
-                  (ice-9 rdelim))
        #:phases
        (modify-phases %standard-phases
          (add-after
           'unpack 'find-libiberty
           (lambda _
-            (let ((plugin (let* ((port (open-input-pipe
-                                        "gcc -print-file-name=plugin"))
-                                 (str  (read-line port)))
-                            (close-pipe port)
-                            str)))
+            (let ((libiberty (assoc-ref %build-inputs "libiberty")))
               (substitute* "cmake/FindIberty.cmake"
-                (("/usr/include") (string-append plugin "/include"))
-                (("libiberty.a iberty") (string-append "NAMES libiberty.a iberty\nPATHS \""
-                                                       (assoc-ref %build-inputs "gcc")
-                                                       "/lib" "\"")))
+                (("/usr/include") (string-append libiberty "/include"))
+                (("libiberty.a iberty")
+                 (string-append "NAMES libiberty.a iberty\nPATHS \""
+                                libiberty "/lib" "\"")))
               #t)))
          (replace
           'install
@@ -279,7 +271,7 @@ files, but compared to grep is much faster and respects files like .gitignore,
             #t)))))
     (home-page "https://github.com/cameronwhite/withershins")
     (inputs
-     `(("gcc" ,gcc-4.8 "lib") ;for libiberty.a
+     `(("libiberty" ,libiberty)
        ("binutils" ,binutils) ;for libbfd
        ("zlib" ,zlib)))
     (synopsis "C++11 library for generating stack traces")
-- 
2.4.3

Re: [PATCH] withershins: use “libiberty” package

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> From 8f6dd7a290d32b154cc353b69373d5a0225d88e5 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <rekado@elephly.net>
> Date: Sun, 28 Jun 2015 10:22:45 +0200
> Subject: [PATCH] gnu: withershins: Use new "libiberty" package.
>
> * gnu/packages/code.scm (withershins)[inputs]: Replace "gcc" with "libiberty".
>    [arguments]: Simplify "find-libiberty" phase.

LGTM!

Ludo'.