diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2015-06-28 10:22:45 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2015-06-29 21:01:13 +0200 |
| commit | 257341086549ed8a02ea35d50593696127f1eed5 (patch) | |
| tree | 5abb95176ddfc00d39c6e0ea8c5a2d47da56551a /gnu/packages/code.scm | |
| parent | 2b6b6d13e7d6b414440fc2260facbe5a6c3af9fe (diff) | |
| download | guix-patches-257341086549ed8a02ea35d50593696127f1eed5.tar guix-patches-257341086549ed8a02ea35d50593696127f1eed5.tar.gz | |
gnu: withershins: Use new "libiberty" package.
* gnu/packages/code.scm (withershins)[inputs]: Replace "gcc" with "libiberty".
[arguments]: Simplify "find-libiberty" phase.
Diffstat (limited to 'gnu/packages/code.scm')
| -rw-r--r-- | gnu/packages/code.scm | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index bcd10828e6..38f14380c4 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") |