From 5b05f8e9654ea722270c45c0fd0eead369bc0daf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 5 Apr 2020 13:54:27 -0400 Subject: 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(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 68cea0a693..18982b7257 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"))) -- cgit 1.4.1