guix-commits
[Top][All Lists]
Advanced

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

05/06: gnu: sonic: Fix installation directories.


From: guix-commits
Subject: 05/06: gnu: sonic: Fix installation directories.
Date: Tue, 31 Mar 2020 08:31:01 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 5acea98e4b38ef4cdc1a8cebf6f784d9fcac9288
Author: Tobias Geerinckx-Rice <address@hidden>
AuthorDate: Mon Mar 30 22:42:45 2020 +0200

    gnu: sonic: Fix installation directories.
    
    * gnu/packages/speech.scm (sonic)[arguments]: Replace erroneous use of
    DESTDIR with PREFIX.  Add the required ‘rpath’ LDFLAGS together with a
    ‘respect-LDFLAGS’ phase.
---
 gnu/packages/speech.scm | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm
index 8ee6fbf..c9c1eaa 100644
--- a/gnu/packages/speech.scm
+++ b/gnu/packages/speech.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2016 David Thompson <address@hidden>
 ;;; Copyright © 2016, 2019, 2020 Marius Bakke <address@hidden>
 ;;; Copyright © 2017 Leo Famulari <address@hidden>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2016 Kei Kebreau <address@hidden>
 ;;; Copyright © 2019 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2020 Nicolas Goaziou <address@hidden>
@@ -226,12 +226,20 @@ stable and well documented interface.")
                "08xwnpw9cnaix1n1i7gvpq5hrfrqc2z1snjhjapfam506hrc77g4"))))
     (build-system gnu-build-system)
     (arguments
-      `(#:tests? #f ; No test suite.
-        #:make-flags
-         (list (string-append "DESTDIR=" (assoc-ref %outputs "out")))
-        #:phases
-        (modify-phases %standard-phases
-          (delete 'configure)))) ; No ./configure script.
+     `(#:tests? #f                      ; no test suite
+       #:make-flags
+       (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+             (string-append "LDFLAGS=-Wl,-rpath="
+                            (assoc-ref %outputs "out") "/lib"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'respect-LDFLAGS
+           (lambda _
+             (substitute* "Makefile"
+               ((" -o sonic " match)
+                (string-append " $(LDFLAGS)" match)))
+             #t))
+         (delete 'configure))))        ; no ./configure script
     (synopsis "Speed up or slow down speech")
     (description "Sonic implements a simple algorithm for speeding up or 
slowing
 down speech.  However, it's optimized for speed ups of over 2X, unlike previous



reply via email to

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