[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
55/104: gnu: Support cross-gccs in (gnu packages suckless).
|
From: |
guix-commits |
|
Subject: |
55/104: gnu: Support cross-gccs in (gnu packages suckless). |
|
Date: |
Sun, 17 May 2020 11:36:39 -0400 (EDT) |
nckx pushed a commit to branch core-updates
in repository guix.
commit 7229d2a49aa707391c07bb01bec4cfd1069c36c8
Author: Tobias Geerinckx-Rice <address@hidden>
AuthorDate: Sat May 16 01:42:26 2020 +0200
gnu: Support cross-gccs in (gnu packages suckless).
* gnu/packages/suckless.scm (blind, dmenu, spoon, slock, st, surf, sent)
(xbattmon, skroll, sbm, prout, noice, human, fortify-headers, colors)
(libutf, lchat, scron)[arguments]: Use ${target}-gcc when
cross-compiling.
---
gnu/packages/suckless.scm | 200 +++++++++++++++++++++++++++++++---------------
1 file changed, 135 insertions(+), 65 deletions(-)
diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index bff7fc4..2a476dc 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -61,10 +61,13 @@
"0nncvzyipvkkd7zlgzwbjygp82frzs2hvbnk71gxf671np607y94"))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f ; no check target
- #:make-flags (list
- "CC=gcc"
- (string-append "PREFIX=" %output))
+ `(#:tests? #f ; no check target
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
@@ -147,12 +150,16 @@ optimising the environment for the application in use and
the task performed.")
"0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk"))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f ; no tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output)
- (string-append "FREETYPEINC="
- (assoc-ref %build-inputs "freetype")
- "/include/freetype2"))
+ `(#:tests? #f ; no tests
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)
+ (string-append "FREETYPEINC="
+ (assoc-ref %build-inputs "freetype")
+ "/include/freetype2")))
#:phases
(modify-phases %standard-phases (delete 'configure))))
(inputs
@@ -182,8 +189,12 @@ numbers of user-defined menu items efficiently.")
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))))
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))))
(inputs
`(("libx11" ,libx11)
("libxkbfile" ,libxkbfile)
@@ -208,9 +219,13 @@ numbers of user-defined menu items efficiently.")
"0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f ; no tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
+ `(#:tests? #f ; no tests
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases (modify-phases %standard-phases (delete 'configure))))
(inputs
`(("libx11" ,libx11)
@@ -236,9 +251,13 @@ numbers of user-defined menu items efficiently.")
(base32 "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk"))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f ; no tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
+ `(#:tests? #f ; no tests
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases
(modify-phases %standard-phases
(delete 'configure)
@@ -277,9 +296,13 @@ drawing.")
"07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps"))))
(build-system glib-or-gtk-build-system)
(arguments
- '(#:tests? #f ; no tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
+ `(#:tests? #f ; no tests
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases
(modify-phases %standard-phases
(delete 'configure)
@@ -323,15 +346,18 @@ point surf to another URI by setting its XProperties.")
`(#:phases (modify-phases %standard-phases
(delete 'configure)) ; no configuration
#:tests? #f ; no test suite
- #:make-flags (let ((pkg-config (lambda (flag)
- (string-append
- "$(shell pkg-config " flag " "
- "xft fontconfig x11 libpng)"))))
- (list
- "CC=gcc"
- (string-append "PREFIX=" %output)
- (string-append "INCS=-I. " (pkg-config "--cflags"))
- (string-append "LIBS=" (pkg-config "--libs") " -lm")))))
+ #:make-flags
+ (let ((target ,(%current-target-system))
+ (pkg-config (lambda (flag)
+ (string-append
+ "$(shell pkg-config " flag " "
+ "xft fontconfig x11 libpng)"))))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)
+ (string-append "INCS=-I. " (pkg-config "--cflags"))
+ (string-append "LIBS=" (pkg-config "--libs") " -lm")))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
@@ -362,9 +388,13 @@ few minutes.")
"1zr6y8lml9xkx0a3dbbsds2qz1bjxvskp7wsckkf8mlsqrbb3xsg"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; No tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))))
+ `(#:tests? #f ; no tests
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))))
(inputs
`(("libx11" ,libx11)))
(home-page "https://git.2f30.org/xbattmon/";)
@@ -420,12 +450,16 @@ drivers capable of injecting packets in wireless
networks.")
"0km6bjfz4ssb1z0xwld6iiixnn7d255ax8yjs3zkdm42z8q9yl0f"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; No tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
+ `(#:tests? #f ; no tests
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases
(modify-phases %standard-phases
- (delete 'configure)))) ; No configure script
+ (delete 'configure)))) ; no configure script
(home-page "https://2f30.org/";)
(synopsis "Commandline utility which scrolls text")
(description
@@ -448,12 +482,16 @@ left.")
"1nks5mkh5wn30kyjzlkjlgi31bv1wq52kbp0r6nzbyfnvfdlywik"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; No tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
+ `(#:tests? #f ; no tests
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases
(modify-phases %standard-phases
- (delete 'configure)))) ; No configure script
+ (delete 'configure)))) ; no configure script
(home-page "https://git.2f30.org/sbm/";)
(synopsis "Simple bandwidth monitor")
(description
@@ -474,12 +512,16 @@ left.")
"1s6c3ygg1h1fyxkh8gd7nzjk6qhnwsb4535d2k780kxnwns5fzas"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; No tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
+ `(#:tests? #f ; no tests
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases
(modify-phases %standard-phases
- (delete 'configure)))) ; No configure script
+ (delete 'configure)))) ; no configure script
(inputs
`(("cups-minimal" ,cups-minimal)
("zlib" ,zlib)))
@@ -507,8 +549,12 @@ cups server to be installed.")
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
@@ -541,8 +587,12 @@ cups server to be installed.")
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
@@ -570,8 +620,12 @@ environment variable.")
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases
(modify-phases %standard-phases
(delete 'configure)))) ; no configure script
@@ -610,12 +664,16 @@ initially intended to be used on musl-based Linux
distributions.
"1lckmqpgj89841splng0sszbls2ag71ggkgr1wsv9y3v6y87589z"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; No tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
+ `(#:tests? #f ; no tests
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases
(modify-phases %standard-phases
- (delete 'configure)))) ; No configure script
+ (delete 'configure)))) ; no configure script
(inputs
`(("libpng" ,libpng)))
(home-page "https://git.2f30.org/colors/";)
@@ -647,12 +705,16 @@ colormap to stdout.")
"1ih5vjavilzggyr1j1z6w1z12c2fs5fg77cfnv7ami5ivsy3kg3d"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; No tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
+ `(#:tests? #f ; no tests
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases
(modify-phases %standard-phases
- (delete 'configure)))) ; No configure script
+ (delete 'configure)))) ; no configure script
(inputs
`(("gawk" ,gawk)))
(home-page "https://github.com/cls/libutf";)
@@ -693,8 +755,12 @@ as -1, to be used instead of U+FFFD.
(build-system gnu-build-system)
(arguments
`(#:test-target "test"
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
@@ -737,12 +803,16 @@ chat output in the background.")
"066fwa55kqcgfrsqgxh94sqbkxfsr691360xg4ljxr4i75d25s2a"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; No tests
- #:make-flags (list "CC=gcc"
- (string-append "PREFIX=" %output))
+ `(#:tests? #f ; no tests
+ #:make-flags
+ (let ((target ,(%current-target-system)))
+ (list (string-append "CC=" (if target
+ (string-append target "-gcc")
+ "gcc"))
+ (string-append "PREFIX=" %output)))
#:phases
(modify-phases %standard-phases
- (delete 'configure)))) ; No configure script
+ (delete 'configure)))) ; no configure script
(home-page "https://git.2f30.org/scron/";)
(synopsis "Simple cron daemon")
(description
- 49/104: gnu: zsh-autosuggestions: Update to 0.6.4., (continued)
- 49/104: gnu: zsh-autosuggestions: Update to 0.6.4., guix-commits, 2020/05/17
- 52/104: gnu: st: Update to 0.8.3., guix-commits, 2020/05/17
- 29/104: gnu: kicad: Re-use common fields in add-ons., guix-commits, 2020/05/17
- 42/104: gnu: Add rawdog., guix-commits, 2020/05/17
- 43/104: gnu: Add openjdk13., guix-commits, 2020/05/17
- 44/104: gnu: Add openjdk14., guix-commits, 2020/05/17
- 47/104: gnu: flowee: Update to 2020.03.3., guix-commits, 2020/05/17
- 48/104: gnu: wine-staging-patchset-data: Update to 5.8., guix-commits, 2020/05/17
- 51/104: gnu: Don't use NAME in (gnu packages suckless) URIs., guix-commits, 2020/05/17
- 53/104: gnu: fortify-headers: Update to 1.1., guix-commits, 2020/05/17
- 55/104: gnu: Support cross-gccs in (gnu packages suckless).,
guix-commits <=
- 60/104: gnu: youtube-dl: Update to 2020.05.08., guix-commits, 2020/05/17
- 62/104: etc: Add a systemd unit to bind-mount @storedir@ read-only., guix-commits, 2020/05/17
- 45/104: gnu: Add lldpd., guix-commits, 2020/05/17
- 50/104: gnu: lchat: Update to 0.0.0-4.e3b64e6., guix-commits, 2020/05/17
- 58/104: gnu: utf8proc: Update to 2.5.0., guix-commits, 2020/05/17
- 61/104: gnu: z3: Update to 4.8.8., guix-commits, 2020/05/17
- 71/104: gnu: gnome-shell-extension-dash-to-dock: Update to 67., guix-commits, 2020/05/17
- 56/104: gnu: Order (gnu packase suckless) module imports., guix-commits, 2020/05/17
- 59/104: gnu: console-setup: Update to 1.195., guix-commits, 2020/05/17
- 54/104: gnu: libutf: Use GIT- helpers., guix-commits, 2020/05/17