* [bug#47693] [PATCH]: Use 'cc-for-target'.
@ 2021-04-10 18:03 Maxime Devos
2021-04-21 23:40 ` Tobias Geerinckx-Rice via Guix-patches via
0 siblings, 1 reply; 5+ messages in thread
From: Maxime Devos @ 2021-04-10 18:03 UTC (permalink / raw)
To: 47693
[-- Attachment #1.1: Type: text/plain, Size: 1159 bytes --]
Hi Guix,
This patch series addressed some warnings generated by the linter defined
in #47676. There will (presumably) be more patches along these lines
later.
These patches do *not* cause any rebuilds (except when cross-compiling),
as (string-append "CC=" (cc-for-target)) evaluates to "CC=gcc" when not
cross-compiling (this is evaluated from within Guix, not from in the build
container, so this doesn't cause a derivation change).
An exception is xssproxy, which needs to be rebuilt, due to nested usage of
quasiquote / unquote. It can probably be worked-around but I don't think
it's worth it for a single package.
./pre-inst-env guix build guix still succeeds, and the derivation for guix
isn't even changed:
$./pre-inst-env guix weather guix
> computing 1 package derivations for x86_64-linux...
> looking for 1 store items on https://ci.guix.gnu.org...
> https://ci.guix.gnu.org
> 100.0% substitutes available (1 out of 1)
> [...]
Now running "./pre-inst-env guix pull --url=$PWD --profile=tmp-prof --disable-authentication --allow-downgrades --banch=BRANCH";
I'll let you know if this fails.
Greetings,
Maxime
[-- Attachment #1.2: 0016-gnu-emacs-xyz-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 1536 bytes --]
From 49ac49daca37f975527f2c2f756f719bd55d47ff Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Sat, 10 Apr 2021 19:36:43 +0200
Subject: [PATCH 16/16] gnu: emacs-xyz: Use 'cc-for-target'.
* gnu/packages/emacs-xyz.scm
(emacs-emacsql, emacs-telega)[arguments]<#:phases>:
Use 'cc-for-target'.
---
gnu/packages/emacs-xyz.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ca1daaeb82..5e7dff1247 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -15484,7 +15484,7 @@ object has been freed.")
(setenv "SHELL" "sh")))
(add-after 'setenv-shell 'build-emacsql-sqlite
(lambda _
- (invoke "make" "binary" "CC=gcc")))
+ (invoke "make" "binary" ,(string-append "CC=" (cc-for-target)))))
(add-after 'build-emacsql-sqlite 'install-emacsql-sqlite
;; This build phase installs emacs-emacsql binary.
(lambda* (#:key outputs #:allow-other-keys)
@@ -25106,7 +25106,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.")
(lambda _
(substitute* "server/Makefile"
(("CC=cc")
- "CC=gcc")
+ ,(string-append "CC=" (cc-for-target)))
(("INSTALL_PREFIX=\\$\\(HOME\\)/.telega")
(string-append "INSTALL_PREFIX=" (assoc-ref %outputs "out")
"/bin"))
--
2.31.1
[-- Attachment #1.3: 0015-gnu-endlessh-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 1120 bytes --]
From 2b6a5782507910a9f8204e30ce2b2bc6bfb7a03c Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Sat, 10 Apr 2021 19:34:31 +0200
Subject: [PATCH 15/16] gnu: endlessh: Use 'cc-for-target'.
* gnu/packages/ssh.scm (endlessh)[arguments]<#:make-flags>:
Use 'cc-for-target'.
---
gnu/packages/ssh.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index fae10d0e16..e022175918 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -878,8 +878,8 @@ of existing remote shell facilities such as SSH.")
(base32 "0ziwr8j1frsp3dajr8h5glkm1dn5cci404kazz5w1jfrp0736x68"))))
(build-system gnu-build-system)
(arguments
- '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
- "CC=gcc")
+ `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
+ ,(string-append "CC=" (cc-for-target)))
#:tests? #f ; no test target
#:phases
(modify-phases %standard-phases
--
2.31.1
[-- Attachment #1.4: 0014-gnu-miniupnpc-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 1118 bytes --]
From 38e4ba37e6804facffbe0c0a23c022d0e12f79df Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Sat, 10 Apr 2021 19:32:14 +0200
Subject: [PATCH 14/16] gnu: miniupnpc: Use 'cc-for-target'.
* gnu/packages/upnp.scm (miniupnpc)[arguments]<#:make-flags>:
Use 'cc-for-target'.
---
gnu/packages/upnp.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm
index 2743ba456d..79e47671ab 100644
--- a/gnu/packages/upnp.scm
+++ b/gnu/packages/upnp.scm
@@ -61,11 +61,11 @@
;; The build system does not use a configure script but depends on
;; `make'. Hence we should pass parameters to `make' instead and remove
;; the configure phase.
- '(#:make-flags
+ `(#:make-flags
(list
(string-append "SH=" (assoc-ref %build-inputs "bash") "/bin/sh")
(string-append "INSTALLPREFIX=" (assoc-ref %outputs "out"))
- "CC=gcc"
+ ,(string-append "CC=" (cc-for-target))
;; Allow executables to find libminiupnpc.so.
(string-append "LDFLAGS=-Wl,-rpath="
--
2.31.1
[-- Attachment #1.5: 0013-gnu-nyancat-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 920 bytes --]
From 6ef5f6ddfcaf28b686e7e666e6a34c9e8b496cbd Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Sat, 10 Apr 2021 19:28:54 +0200
Subject: [PATCH 13/16] gnu: nyancat: Use 'cc-for-target'.
* gnu/packages/toys.scm
(nyancat)[arguments]<#:make-flags>: Use 'cc-for-target'.
---
gnu/packages/toys.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm
index f88ea68436..bbd5753841 100644
--- a/gnu/packages/toys.scm
+++ b/gnu/packages/toys.scm
@@ -219,7 +219,7 @@ and various scenery elements.")
"1mg8nm5xzcq1xr8cvx24ym2vmafkw53rijllwcdm9miiz0p5ky9k"))))
(build-system gnu-build-system)
(arguments
- '(#:make-flags '("CC=gcc")
+ `(#:make-flags '(,(string-append "CC=" (cc-for-target)))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
--
2.31.1
[-- Attachment #1.6: 0012-gnu-image-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 2482 bytes --]
From 8b375ad6ea6e151ad3a8fa5f77c5851668ec0a4a Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Sat, 10 Apr 2021 19:25:04 +0200
Subject: [PATCH 12/16] gnu: image: Use 'cc-for-target'.
* gnu/packages/image.scm
(libjxr, giflib, freeimage)[arguments]<#:make-flags>:
Use 'cc-for-target'.
---
gnu/packages/image.scm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index d04a247976..2047fe1e0f 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 "
--
2.31.1
[-- Attachment #1.7: 0011-gnu-networking-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 5638 bytes --]
From 313049b07ac876e858f079b7826a6adc5881dfb9 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Sat, 10 Apr 2021 14:26:38 +0200
Subject: [PATCH 11/16] gnu: networking: Use 'cc-for-target'.
* gnu/packages/networking.scm
(httping, pixiewps, sslh, nethogs, spiped, can-utils)
(hcxtools, batctl)[arguments]<#:make-flags>: Use 'cc-for-target'.
---
gnu/packages/networking.scm | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 133f525cb9..a7ac5fe1fe 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1304,7 +1304,7 @@ and min/max network usage.")
"0gh17kcxxi37k65zm4gqsvbk3aw7yphcs3c02pn1c4s2y6n40axd"))))
(build-system gnu-build-system)
(arguments
- '(#:phases
+ `(#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'fix-ifconfig-path
@@ -1322,7 +1322,7 @@ and min/max network usage.")
test_parse_format_ipv(4(|_listen_all|_mapped_ipv6)|6)\\);")
""))
#t)))
- #:make-flags (list "CC=gcc"
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
(string-append "prefix=" (assoc-ref %outputs "out")))
#:test-target "test"))
(inputs `(("net-tools" ,net-tools)
@@ -1604,7 +1604,7 @@ transmission protocol (SCTP) in a Go application.")
("ncurses" ,ncurses)
("openssl" ,openssl)))
(arguments
- `(#:make-flags (list "CC=gcc"
+ `(#:make-flags (list ,(string-append "CC=" (cc-for-target))
(string-append "DESTDIR=" (assoc-ref %outputs "out"))
"PREFIX=")
#:tests? #f)) ; no tests
@@ -1805,8 +1805,8 @@ allows for heavy scripting.")
"07nym6bqml0k9v29vnj003nrgnwrywgjvnljb7cdpsvnwilhbp64"))))
(build-system gnu-build-system)
(arguments
- '(#:make-flags
- (list "CC=gcc"
+ `(#:make-flags
+ (list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
@@ -2264,7 +2264,7 @@ library remains flexible, portable, and easily embeddable.")
("pcre" ,pcre)
("tcp-wrappers" ,tcp-wrappers)))
(arguments
- '(#:phases
+ `(#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
(add-before 'check 'fix-tests
@@ -2286,7 +2286,7 @@ library remains flexible, portable, and easily embeddable.")
(append (find-files "." "\\.cfg")
(find-files "scripts"))))
#t)))
- #:make-flags (list "CC=gcc"
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
"USELIBCAP=1"
"USELIBWRAP=1"
(string-append "PREFIX=" (assoc-ref %outputs "out")))
@@ -2349,7 +2349,7 @@ the bandwidth, loss, and other parameters.")
`(("libpcap" ,libpcap)
("ncurses" ,ncurses)))
(arguments
- `(#:make-flags `("CC=gcc"
+ `(#:make-flags `(,,(string-append "CC=" (cc-for-target))
,(string-append "PREFIX=" %output)
,(string-append "VERSION=" ,version))
#:phases
@@ -2577,11 +2577,11 @@ returns the user name and other information about the connection.")
"04rpnc53whfky7pp2m9h35gwzwn6788pnl6c1qd576mpknbqjw4d"))))
(build-system gnu-build-system)
(arguments
- '(#:test-target "test"
+ `(#:test-target "test"
#:make-flags (let* ((out (assoc-ref %outputs "out"))
(bindir (string-append out "/bin"))
(man1dir (string-append out "/share/man/man1")))
- (list "CC=gcc" ; It tries to invoke `c99`.
+ (list ,(string-append "CC=" (cc-for-target)) ; It tries to invoke `c99`.
(string-append "BINDIR=" bindir)
(string-append "MAN1DIR=" man1dir)))
#:phases
@@ -3000,7 +3000,7 @@ from user-space. It requires a kernel built with SocketCAN support.")
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; No tests exist.
- #:make-flags (list "CC=gcc"
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX="
(assoc-ref %outputs "out")))
#:phases
@@ -3253,7 +3253,7 @@ Ethernet and TAP interfaces is supported. Packet capture is also supported.")
("zlib" ,zlib)))
(arguments
`(#:make-flags
- (list "CC=gcc"
+ (list ,(string-append "CC=" (cc-for-target))
(string-append "INSTALLDIR=" (assoc-ref %outputs "out") "/bin"))
#:tests? #f ; no test suite
#:phases
@@ -3611,7 +3611,7 @@ written (and providing API) in C. Current implementation covers YANG 1.0 (RFC
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "PKG_CONFIG=" (assoc-ref %build-inputs "pkg-config")
"/bin/pkg-config")
- "CC=gcc")))
+ ,(string-append "CC=" (cc-for-target)))))
(home-page "https://www.open-mesh.org/projects/batman-adv/wiki/Wiki")
(synopsis "Management tool for the mesh networking BATMAN protocol")
(description "This package provides a control tool for the
--
2.31.1
[-- Attachment #1.8: 0010-gnu-image-viewers-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 1932 bytes --]
From c0777a1a0fba6f8591ffadc3a8bb977350bbbbbe Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Sat, 10 Apr 2021 13:52:07 +0200
Subject: [PATCH 10/16] gnu: image-viewers: Use 'cc-for-target'.
* gnu/packages/image-viewers.scm
(feh, imv)[arguments]<#:make-flags>: Use 'cc-for-target'.
---
gnu/packages/image-viewers.scm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index b7c1ebc829..c7dd358ad4 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -89,10 +89,11 @@
"1d13x8hmvpdc5f5rj4l29ha7iz7wvqxjlvh6il04wq8igzrj0x23"))))
(build-system gnu-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases (delete 'configure))
+ `(#:phases (modify-phases %standard-phases (delete 'configure))
#:test-target "test"
#:make-flags
- (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))
+ (list ,(string-append "CC=" (cc-for-target))
+ (string-append "PREFIX=" (assoc-ref %outputs "out"))
"exif=1"
"inotify=1")))
(native-inputs
@@ -579,7 +580,7 @@ displayed in a terminal.")
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
- '(#:phases
+ `(#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'install 'record-absolute-file-names
@@ -593,7 +594,7 @@ displayed in a terminal.")
(string-append bin "/imv-")))
#t))))
#:make-flags
- (list "CC=gcc"
+ (list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "CONFIGPREFIX="
(assoc-ref %outputs "out") "/etc"))))
--
2.31.1
[-- Attachment #1.9: 0009-gnu-cbatticon-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 966 bytes --]
From cce294f8c7c48584d7658ba20db02cac5e01d300 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Sat, 10 Apr 2021 13:47:52 +0200
Subject: [PATCH 09/16] gnu: cbatticon: Use 'cc-for-target'.
* gnu/packages/admin.scm (cbatticon)[arguments]<#:make-flags>:
Use 'cc-for-target'.
---
gnu/packages/admin.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 06fc6baa46..2f362d1648 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3003,7 +3003,7 @@ produce uniform output across heterogeneous networks.")
`(#:tests? #f ; no tests
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out"))
- "CC=gcc")
+ ,(string-append "CC=" (cc-for-target)))
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
--
2.31.1
[-- Attachment #1.10: 0008-gnu-xdisorg-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 4162 bytes --]
From 4be68610c9f2ff1773f7e409ee8f2bf02fb4ebf9 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Fri, 9 Apr 2021 22:22:43 +0200
Subject: [PATCH 08/16] gnu: xdisorg: Use 'cc-for-target'.
* gnu/packages/xdisorg.scm
(bemenu, xbanish, sxhkd, xcape, xssproxy, xrandr-invert-colors)
(hsetroot)[arguments]<#:make-flags>: Use 'cc-for-target'.
(xsettingsd)[arguments]<#:scons-flags>: Likewise.
---
gnu/packages/xdisorg.scm | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 725ea0afd6..3706d2026d 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -269,8 +269,8 @@ used to further tweak the behaviour of the different profiles.")
(base32 "1fjcs9d3533ay3nz79cx3c0lmy2chgragr2lhsy0xl2ckr0iins0"))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f
- #:make-flags (list "CC=gcc"
+ `(#:tests? #f
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
"CFLAGS=-O2 -fPIC"
(string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib")
@@ -892,7 +892,7 @@ to find buttons, etc, on the screen to click on.")
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
- #:make-flags (list "CC=gcc"
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases (modify-phases %standard-phases
(delete 'configure)))) ; no configure script
@@ -1071,7 +1071,7 @@ Guile will work for XBindKeys.")
`(#:phases (modify-phases %standard-phases (delete 'configure))
#:tests? #f ; no check target
#:make-flags
- (list "CC=gcc"
+ (list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" %output)
;; Keep the documentation where the build system installs LICENSE.
(string-append "DOCPREFIX=" %output
@@ -1184,7 +1184,7 @@ within a single process.")
#:phases (modify-phases %standard-phases (delete 'configure))
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
"MANDIR=/share/man/man1"
- "CC=gcc")))
+ ,(string-append "CC=" (cc-for-target)))))
(inputs
`(("libxtst" ,libxtst)
("libx11" ,libx11)))
@@ -1553,7 +1553,7 @@ demos. It also acts as a nice screen locker.")
(arguments `(#:make-flags `("bindir=/bin"
"man1dir=/share/man/man1"
,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
- "CC=gcc")
+ ,,(string-append "CC=" (cc-for-target)))
#:phases (modify-phases %standard-phases
(delete 'configure)
(delete 'check))))
@@ -2102,7 +2102,7 @@ to automatically turn it on on login.")
"1br3x9vr6xm4ika06n8cfxx1b3wdchdqvyzjl4y1chmivrml8x9h"))))
(build-system gnu-build-system)
(arguments
- `(#:make-flags (list "CC=gcc")
+ `(#:make-flags (list ,(string-append "CC=" (cc-for-target)))
#:tests? #f ; there are none
#:phases
(modify-phases %standard-phases
@@ -2413,7 +2413,7 @@ Xwrits hides itself until you should take another break.")
(arguments
`(#:scons ,scons-python2
#:scons-flags
- (list "CC=gcc")
+ (list ,(string-append "CC=" (cc-for-target)))
#:phases
(modify-phases %standard-phases
(add-before 'build 'patch-sconstruct
@@ -2768,7 +2768,7 @@ and execute @file{.desktop} files of the Application type.")
`(#:tests? #f
#:make-flags
(list
- "CC=gcc"
+ ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
--
2.31.1
[-- Attachment #1.11: 0007-gnu-pgpdump-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 1216 bytes --]
From f4f07ed5b969cb0407917f86e8f1fd5ddbfb6f3c Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Fri, 9 Apr 2021 22:08:21 +0200
Subject: [PATCH 07/16] gnu: pgpdump: Use 'cc-for-target'.
* gnu/packages/gnupg.scm
(pgpdump)[arguments]<#:make-flags>: Use 'cc-for-target'.
---
gnu/packages/gnupg.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index bb611bdb89..fefa1e01f1 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -72,6 +72,7 @@
#:use-module (gnu packages xml)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix utils)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
@@ -996,7 +997,7 @@ them to transform your existing public key into a secret key.")
(arguments
`(#:tests? #f ; no make check
#:configure-flags (list "--prefix=/")
- #:make-flags (list "CC=gcc"
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
(string-append "DESTDIR=" (assoc-ref %outputs "out")))))
(inputs
`(("zlib" ,zlib)))
--
2.31.1
[-- Attachment #1.12: 0006-gnu-fbida-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 1310 bytes --]
From ef4eab5e17d8fb1d2d325a1c2e48942db965c9ad Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Fri, 9 Apr 2021 22:06:00 +0200
Subject: [PATCH 06/16] gnu: fbida: Use 'cc-for-target'.
* gnu/packages/pdf.scm
(fbida)[arguments]<#:make-flags>: Use 'cc-for-target'.
---
gnu/packages/pdf.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index cbbdf68f5b..2e07fda595 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -1135,7 +1135,7 @@ information for every pixel as the input.")
"0f242mix20rgsqz1llibhsz4r2pbvx6k32rmky0zjvnbaqaw1dwm"))))
(build-system gnu-build-system)
(arguments
- '(#:phases
+ `(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-FHS-file-names
(lambda _
@@ -1144,7 +1144,7 @@ information for every pixel as the input.")
(("/sbin/ldconfig -p") "echo lib")) #t))
(delete 'configure))
#:tests? #f
- #:make-flags (list "CC=gcc"
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
(string-append "prefix=" (assoc-ref %outputs "out")))))
(inputs `(("libjpeg" ,libjpeg-turbo)
("curl" ,curl)
--
2.31.1
[-- Attachment #1.13: 0005-gnu-cd-discid-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 1064 bytes --]
From c3c52cfa145db74af86cb0f274b81a0ec7b7a586 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Fri, 9 Apr 2021 22:04:29 +0200
Subject: [PATCH 05/16] gnu: cd-discid: Use 'cc-for-target'.
* gnu/packages/cdrom.scm
(cd-discid)[arguments]<#:make-flags>: Use 'cc-for-target'.
---
gnu/packages/cdrom.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index d93c673ac2..17833f4a48 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -599,9 +599,9 @@ the data.")
#t))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f
+ `(#:tests? #f
#:phases (modify-phases %standard-phases (delete 'configure))
- #:make-flags (list "CC=gcc"
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX="
(assoc-ref %outputs "out")))))
(synopsis "Get CDDB discid information from an audio CD")
--
2.31.1
[-- Attachment #1.14: 0004-gnu-lua-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 3139 bytes --]
From 68585d807387da7596420044d0d0a66234c5f6ec Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Fri, 9 Apr 2021 21:58:24 +0200
Subject: [PATCH 04/16] gnu: lua: Use 'cc-for-target'.
* 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>:
Use 'cc-for-target'.
---
gnu/packages/lua.scm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 0a1ca19a6f..98f774c428 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -215,7 +215,7 @@ some projects.")))
`(#:make-flags
(let ((out (assoc-ref %outputs "out"))
(lua-version ,(version-major+minor (package-version lua))))
- (list "CC=gcc"
+ (list ,(string-append "CC=" (cc-for-target))
(string-append "LUA_LDIR=" out "/share/lua/" lua-version)
(string-append "LUA_CDIR=" out "/lib/lua/" lua-version)))
#:phases
@@ -356,7 +356,7 @@ directory structure and file attributes.")
`(#:make-flags
(let ((out (assoc-ref %outputs "out"))
(lua-api-version ,(version-major+minor (package-version lua))))
- (list "CC=gcc"
+ (list ,(string-append "CC=" (cc-for-target))
"CFLAGS='-D HAVE_SYS_SYSCTL_H=0'" ; sys/sysctl.h is deprecated
(string-append "prefix=" out)
(string-append "LUA_APIS=" lua-api-version)))
@@ -417,7 +417,7 @@ binds OpenSSL's bignum, message digest, HMAC, cipher, and CSPRNG interfaces.")
(let ((out (assoc-ref %outputs "out"))
(lua-version ,(version-major+minor (package-version lua))))
(list "linux"
- "CC=gcc"
+ ,(string-append "CC=" (cc-for-target))
"LD=gcc"
(string-append "LUAPATH=" out "/share/lua/" lua-version)
(string-append "LUACPATH=" out "/lib/lua/" lua-version)))
@@ -465,7 +465,7 @@ secure session between the peers.")
#:make-flags
(let ((out (assoc-ref %outputs "out"))
(lua-api-version ,(version-major+minor (package-version lua))))
- (list "CC=gcc"
+ (list ,(string-append "CC=" (cc-for-target))
(string-append "LUA_APIS=" lua-api-version)))
#:phases
(modify-phases %standard-phases
@@ -657,7 +657,7 @@ describing the commented declarations and functions.")
(build-system gnu-build-system)
(arguments
`(#:make-flags
- (list "CC=gcc"
+ (list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
@@ -1014,7 +1014,7 @@ on numbers.")
(build-system gnu-build-system)
(arguments
`(#:tests? #f ;TODO: Run the test suite.
- #:make-flags (list "CC=gcc"
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" %output))
#:phases
(modify-phases %standard-phases
--
2.31.1
[-- Attachment #1.15: 0003-gnu-crypto-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 2905 bytes --]
From 4fe4950da0373cd1ef87420eb651f11f70a1d5b8 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Fri, 9 Apr 2021 21:54:58 +0200
Subject: [PATCH 03/16] gnu: crypto: Use 'cc-for-target'.
* gnu/packages/crypto.scm
(signify, keyutils, ssss, libscrypt, enchive)[arguments]<#:make-flags>:
Use 'cc-for-target'.
---
gnu/packages/crypto.scm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 57d417de80..1c9677ff94 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -214,7 +214,7 @@ communication, encryption, decryption, signatures, etc.")
;; like OpenBSD's pledge().
(arguments
`(#:make-flags
- (list "CC=gcc"
+ (list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
@@ -376,7 +376,7 @@ the wrong hands.")
(arguments
`(#:phases (modify-phases %standard-phases
(delete 'configure)) ; no configure script
- #:make-flags (list "CC=gcc"
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
"RPATH=-Wl,-rpath,$(DESTDIR)$(LIBDIR)"
(string-append "DESTDIR="
(assoc-ref %outputs "out"))
@@ -469,7 +469,7 @@ no man page, refer to the home page for usage details.")
(arguments
`(#:tests? #f ; No test suite
#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
- "CC=gcc")
+ ,(string-append "CC=" (cc-for-target)))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configuration to be done
@@ -629,7 +629,7 @@ attacks than alternative functions such as @code{PBKDF2} or @code{bcrypt}.")
(outputs (list "out" "static"))
(arguments
`(#:make-flags (list (string-append "PREFIX=" %output)
- "CC=gcc")
+ ,(string-append "CC=" (cc-for-target)))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
@@ -1069,8 +1069,9 @@ cannot sign messages in OpenBSD format yet.")
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f ; no check target '
- #:make-flags (list "CC=gcc" "PREFIX=$(out)")
+ `(#:tests? #f ; no check target '
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
+ "PREFIX=$(out)")
#:phases (modify-phases %standard-phases
(delete 'configure)
(add-after 'install 'post-install
--
2.31.1
[-- Attachment #1.16: 0002-gnu-dev86-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 1053 bytes --]
From 3871a829e43f74c71be1dddb3ada7f8020cda90c Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Fri, 9 Apr 2021 21:51:48 +0200
Subject: [PATCH 02/16] gnu: dev86: Use 'cc-for-target'.
* gnu/packages/assembly.scm (dev86)[arguments]<#:make-flags>:
Use 'cc-for-target'.
---
gnu/packages/assembly.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index dbed33bb3d..51c0572674 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -228,7 +228,7 @@ It has macro abilities and focuses on operating system portability.")
(build-system gnu-build-system)
(arguments
`(#:parallel-build? #f ; They use submakes wrong
- #:make-flags (list "CC=gcc"
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX="
(assoc-ref %outputs "out")))
#:system "i686-linux" ; Standalone ld86 had problems otherwise
--
2.31.1
[-- Attachment #1.17: 0001-gnu-irc-Use-cc-for-target.patch --]
[-- Type: text/x-patch, Size: 1823 bytes --]
From 688ac40430952dc34bfb239ddf29da366b74b3bc Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Fri, 9 Apr 2021 21:46:24 +0200
Subject: [PATCH 01/16] gnu: irc: Use 'cc-for-target'.
As replacing "CC=gcc" with ,(string-append "CC=" (cc-for-target))
does not change the derivation, this patch will not cause any
rebuilds, except when cross-compiling (but cross-compiling wass
broken anyway). Likewise for the other patches in this series.
* gnu/packages/irc.scm (ii, sic)[arguments]<#:make-flags>:
Use 'cc-for-target'.
---
gnu/packages/irc.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 5fba72b576..12f50cc523 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -30,6 +30,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix download)
#:use-module (guix git-download)
+ #:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk)
@@ -341,7 +342,7 @@ for the IRCv3 protocol.")
(arguments
`(#:tests? #f ; no tests
#:make-flags (list (string-append "PREFIX=" %output)
- "CC=gcc")
+ ,(string-append "CC=" (cc-for-target)))
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure
@@ -365,7 +366,7 @@ for the IRCv3 protocol.")
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
- #:make-flags (list "CC=gcc"
+ #:make-flags (list ,(string-append "CC=" (cc-for-target))
(string-append "PREFIX=" %output))
#:phases
(modify-phases %standard-phases
--
2.31.1
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#47693] [PATCH]: Use 'cc-for-target'.
2021-04-10 18:03 [bug#47693] [PATCH]: Use 'cc-for-target' Maxime Devos
@ 2021-04-21 23:40 ` Tobias Geerinckx-Rice via Guix-patches via
2021-04-22 16:44 ` Maxime Devos
0 siblings, 1 reply; 5+ messages in thread
From: Tobias Geerinckx-Rice via Guix-patches via @ 2021-04-21 23:40 UTC (permalink / raw)
To: 47693
[-- Attachment #1: Type: text/plain, Size: 701 bytes --]
Maxime,
Thanks for this series!
I applied it by downloading from the first top-right ‘Download’
link and using ‘git am --patch-format mbox /tmp/47693-0.mbox’. It
works to apply all changes, but combines them all into a single
commit.
If anyone knows how to apply whole mboxes from the archives, as
separate commits, please let me know. I'll push it as soon as I
learn how!
One very minor correction:
> An exception is xssproxy, which needs to be rebuilt,
> due to nested usage ofquasiquote / unquote.
There are two: ‘nethogs’ is the other.
Both are cheap (C <3 U) leaf packages. I don't think it worth
working around either.
Kind regards,
T G-R
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#47693] [PATCH]: Use 'cc-for-target'.
2021-04-21 23:40 ` Tobias Geerinckx-Rice via Guix-patches via
@ 2021-04-22 16:44 ` Maxime Devos
2021-04-22 16:51 ` Maxime Devos
0 siblings, 1 reply; 5+ messages in thread
From: Maxime Devos @ 2021-04-22 16:44 UTC (permalink / raw)
To: Tobias Geerinckx-Rice, 47693
[-- Attachment #1: Type: text/plain, Size: 1552 bytes --]
Tobias Geerinckx-Rice via Guix-patches via schreef op do 22-04-2021 om 01:40 [+0200]:
> Maxime,
>
> Thanks for this series!
>
> I applied it by downloading from the first top-right ‘Download’
> link and using ‘git am --patch-format mbox /tmp/47693-0.mbox’. It
> works to apply all changes, but combines them all into a single
> commit.
Can you download each patch separately, say as
download-dir/0001-first.patch
download-dir/0001-second.patch
...
and run "git am download-dir/*.patch"?
Ideally, "git am --patch-format mbox ..." would ‘just work’ though ...
> If anyone knows how to apply whole mboxes from the archives, as
> separate commits, please let me know. I'll push it as soon as I
> learn how!
Alternatively, you could fetch from my public repo
(branch: cc-for-target, current latest commit: 49ac49daca37f975527f2c2f756f719bd55d47ff,
url: https://notabug.org/mdevos/guix). (You'll need to rebase and sign the commits
yourself instead of doing a mergo, I am not in .guix-authorizations.)
IIRC, I have not yet sent the latest commits to the latest mailing list though,
and it also contains a separate commit ‘lint: Add 'compiler-for-target' checker.’.
> One very minor correction:
>
> > An exception is xssproxy, which needs to be rebuilt,
> > due to nested usage ofquasiquote / unquote.
>
> There are two: ‘nethogs’ is the other.
Ok.
> Both are cheap (C <3 U) leaf packages. I don't think it worth
> working around either.
Agreed.
Greetings,
Maxime.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#47693] [PATCH]: Use 'cc-for-target'.
2021-04-22 16:44 ` Maxime Devos
@ 2021-04-22 16:51 ` Maxime Devos
2021-07-08 14:34 ` bug#47693: " Mathieu Othacehe
0 siblings, 1 reply; 5+ messages in thread
From: Maxime Devos @ 2021-04-22 16:51 UTC (permalink / raw)
To: Tobias Geerinckx-Rice, 47693
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
> Alternatively, you could fetch from my public repo
> (branch: cc-for-target, current latest commit: 49ac49daca37f975527f2c2f756f719bd55d47ff,
> url: https://notabug.org/mdevos/guix).
Oops this should have been
<https://notabug.org/mdevos/guix-gnunet/>.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#47693: [PATCH]: Use 'cc-for-target'.
2021-04-22 16:51 ` Maxime Devos
@ 2021-07-08 14:34 ` Mathieu Othacehe
0 siblings, 0 replies; 5+ messages in thread
From: Mathieu Othacehe @ 2021-07-08 14:34 UTC (permalink / raw)
To: Maxime Devos; +Cc: 47693-done, Tobias Geerinckx-Rice
Hey,
It appears that this has been pushed, so closing.
Thanks,
Mathieu
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-07-08 14:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-10 18:03 [bug#47693] [PATCH]: Use 'cc-for-target' Maxime Devos
2021-04-21 23:40 ` Tobias Geerinckx-Rice via Guix-patches via
2021-04-22 16:44 ` Maxime Devos
2021-04-22 16:51 ` Maxime Devos
2021-07-08 14:34 ` bug#47693: " Mathieu Othacehe
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).