[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: gsm: Fix installation directory.
From: |
guix-commits |
Subject: |
01/02: gnu: gsm: Fix installation directory. |
Date: |
Sun, 5 Apr 2020 14:19:01 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 5b05f8e9654ea722270c45c0fd0eead369bc0daf
Author: Maxim Cournoyer <address@hidden>
AuthorDate: Sun Apr 5 13:54:27 2020 -0400
gnu: gsm: Fix installation directory.
This is a follow-up commit to 74c7f367daa, which broke the installation of
the
bin, lib and share artifacts.
* gnu/packages/audio.scm (gsm)[make-flags]: Programmatically build the
INSTALL_ROOT make flag so that the %output variable gets properly expanded.
Instead of repeating the default CCFLAGS values as a make flag...
[phases]: ...add "-fPIC" using substitutes* in a new add-fpic-ccflag phase.
---
gnu/packages/audio.scm | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 68cea0a..18982b7 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3356,11 +3356,17 @@ code, used in @code{libtoxcore}.")
(build-system gnu-build-system)
(arguments
`(#:test-target "tst"
- #:make-flags '("INSTALL_ROOT=%output"
- "CCFLAGS=-fPIC \
--c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment") ;default options
+ #:make-flags (list (string-append "INSTALL_ROOT=" %output))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'add-fpic-ccflag
+ (lambda _
+ ;; The -fPIC compiler option is needed when building
+ ;; mediastreamer.
+ (substitute* "Makefile"
+ (("^CCFLAGS.*" all)
+ (string-append all "CCFLAGS += -fPIC")))
+ #t))
(add-before 'install 'pre-install
(lambda _
(let ((out (assoc-ref %outputs "out")))