diff options
| author | Maxime Devos <maximedevos@telenet.be> | 2021-04-09 21:46:24 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-05-02 03:00:03 +0200 |
| commit | 9c44af6bd67579ef0d916ecf23fe832c9d17802f (patch) | |
| tree | 0ad4adeacaefb7c56d19969f09d0008e1fa8c594 /gnu/packages/image.scm | |
| parent | eb305784bfa229043d53ce60c130e25b07e1447f (diff) | |
| download | guix-9c44af6bd67579ef0d916ecf23fe832c9d17802f.tar.gz | |
gnu: Replace hard-coded "CC=gcc" with CC-FOR-TARGET calls.
* gnu/packages/admin.scm (cbatticon)[arguments]<#:make-flags>: Use CC-FOR-TARGET. * gnu/packages/assembly.scm (dev86)[arguments]<#:make-flags>: Likewise. * gnu/packages/cdrom.scm (cd-discid)[arguments]<#:make-flags>: Likewise. * gnu/packages/crypto.scm (signify, keyutils, ssss, libscrypt, enchive) [arguments]<#:make-flags>: Likewise. * gnu/packages/emacs-xyz.scm (emacs-emacsql, emacs-telega)[arguments] <#:phases>: Likewise. * gnu/packages/gnupg.scm (pgpdump)[arguments]<#:make-flags>: Likewise. * gnu/packages/image-viewers.scm (feh, imv)[arguments]<#:make-flags>: Likewise. * gnu/packages/image.scm (libjxr, giflib, freeimage)[arguments] <#:make-flags>: Likewise. * gnu/packages/irc.scm (ii, sic)[arguments]<#:make-flags>: Likewise. * gnu/packages/lua.scm (make-lua-expat, make-lua-ossl, make-lua-sec) (make-lua-cqueues, make-lua-lgi, lua-resty-signal)[arguments] <#:make-flags>: Likewise. * gnu/packages/networking.scm (httping, pixiewps, sslh, nethogs, spiped) (can-utils, hcxtools, batctl)[arguments]<#:make-flags>: Likewise. * gnu/packages/pdf.scm (fbida)[arguments]<#:make-flags>: Likewise. * gnu/packages/ssh.scm (endlessh)[arguments]<#:make-flags>: Likewise. * gnu/packages/toys.scm (nyancat)[arguments]<#:make-flags>: Likewise. * gnu/packages/upnp.scm (miniupnpc)[arguments]<#:make-flags>: Likewise. * gnu/packages/xdisorg.scm (bemenu, xbanish, sxhkd, xcape, xssproxy) (xrandr-invert-colors, hsetroot, xsettingsd)[arguments]<#:make-flags>: Likewise. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index d0c12016ca..64863cd3b3 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -457,8 +457,8 @@ lossless JPEG manipulations such as rotation, scaling or cropping: "libjxr-fix-typos.patch")))) (build-system gnu-build-system) (arguments - '(#:make-flags - (list "CC=gcc" + `(#:make-flags + (list ,(string-append "CC=" (cc-for-target)) ;; A substitute* procedure call would be enough to add the -fPIC ;; flag if there was no file decoding error. ;; The makefile is a "Non-ISO extended-ASCII text, with CRLF line @@ -890,7 +890,7 @@ JPEG 2000 Reference Software.") (outputs '("bin" ; utility programs "out")) ; library (arguments - '(#:make-flags (list "CC=gcc" + `(#:make-flags (list ,(string-append "CC=" (cc-for-target)) (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "BINDIR=" @@ -1114,7 +1114,7 @@ supplies a generic doubly-linked list and some string functions.") "0cwjxjz0f4gs6igvwqg0p99mnrsrwzkal1l2n08yvz2xq9s5khki")))))))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases ;; According to Fedora these files depend on private headers, but their ;; presence is required for building, so we replace them with empty files. @@ -1138,7 +1138,7 @@ supplies a generic doubly-linked list and some string functions.") (("-o root -g root") "")) #t))) #:make-flags - (list "CC=gcc" + (list ,(string-append "CC=" (cc-for-target)) ;; We need '-fpermissive' for Source/FreeImage.h. ;; libjxr doesn't have a pkg-config file. (string-append "CFLAGS+=-O2 -fPIC -fvisibility=hidden -fpermissive " |