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.
This commit is contained in:
Tobias Geerinckx-Rice 2020-05-16 01:42:26 +02:00
parent 259da51495
commit 211dc8cdd8
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -61,10 +61,13 @@ (define-public blind
"0nncvzyipvkkd7zlgzwbjygp82frzs2hvbnk71gxf671np607y94")))) "0nncvzyipvkkd7zlgzwbjygp82frzs2hvbnk71gxf671np607y94"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:make-flags (list #:make-flags
"CC=gcc" (let ((target ,(%current-target-system)))
(string-append "PREFIX=" %output)) (list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; no configure script (delete 'configure)))) ; no configure script
@ -147,12 +150,16 @@ (define-public dmenu
"0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk")))) "0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output) (let ((target ,(%current-target-system)))
(string-append "FREETYPEINC=" (list (string-append "CC=" (if target
(assoc-ref %build-inputs "freetype") (string-append target "-gcc")
"/include/freetype2")) "gcc"))
(string-append "PREFIX=" %output)
(string-append "FREETYPEINC="
(assoc-ref %build-inputs "freetype")
"/include/freetype2")))
#:phases #:phases
(modify-phases %standard-phases (delete 'configure)))) (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
@ -182,8 +189,12 @@ (define-public spoon
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)))) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))))
(inputs (inputs
`(("libx11" ,libx11) `(("libx11" ,libx11)
("libxkbfile" ,libxkbfile) ("libxkbfile" ,libxkbfile)
@ -208,9 +219,13 @@ (define-public slock
"0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m")))) "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (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)))) #:phases (modify-phases %standard-phases (delete 'configure))))
(inputs (inputs
`(("libx11" ,libx11) `(("libx11" ,libx11)
@ -236,9 +251,13 @@ (define-public st
(base32 "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk")))) (base32 "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
@ -277,9 +296,13 @@ (define-public surf
"07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps")))) "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
'(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
@ -323,15 +346,18 @@ (define-public sent
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(delete 'configure)) ; no configuration (delete 'configure)) ; no configuration
#:tests? #f ; no test suite #:tests? #f ; no test suite
#:make-flags (let ((pkg-config (lambda (flag) #:make-flags
(string-append (let ((target ,(%current-target-system))
"$(shell pkg-config " flag " " (pkg-config (lambda (flag)
"xft fontconfig x11 libpng)")))) (string-append
(list "$(shell pkg-config " flag " "
"CC=gcc" "xft fontconfig x11 libpng)"))))
(string-append "PREFIX=" %output) (list (string-append "CC=" (if target
(string-append "INCS=-I. " (pkg-config "--cflags")) (string-append target "-gcc")
(string-append "LIBS=" (pkg-config "--libs") " -lm"))))) "gcc"))
(string-append "PREFIX=" %output)
(string-append "INCS=-I. " (pkg-config "--cflags"))
(string-append "LIBS=" (pkg-config "--libs") " -lm")))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
@ -362,9 +388,13 @@ (define-public xbattmon
"1zr6y8lml9xkx0a3dbbsds2qz1bjxvskp7wsckkf8mlsqrbb3xsg")))) "1zr6y8lml9xkx0a3dbbsds2qz1bjxvskp7wsckkf8mlsqrbb3xsg"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)))) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))))
(inputs (inputs
`(("libx11" ,libx11))) `(("libx11" ,libx11)))
(home-page "https://git.2f30.org/xbattmon/") (home-page "https://git.2f30.org/xbattmon/")
@ -420,12 +450,16 @@ (define-public skroll
"0km6bjfz4ssb1z0xwld6iiixnn7d255ax8yjs3zkdm42z8q9yl0f")))) "0km6bjfz4ssb1z0xwld6iiixnn7d255ax8yjs3zkdm42z8q9yl0f"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; No configure script (delete 'configure)))) ; no configure script
(home-page "https://2f30.org/") (home-page "https://2f30.org/")
(synopsis "Commandline utility which scrolls text") (synopsis "Commandline utility which scrolls text")
(description (description
@ -448,12 +482,16 @@ (define-public sbm
"1nks5mkh5wn30kyjzlkjlgi31bv1wq52kbp0r6nzbyfnvfdlywik")))) "1nks5mkh5wn30kyjzlkjlgi31bv1wq52kbp0r6nzbyfnvfdlywik"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; No configure script (delete 'configure)))) ; no configure script
(home-page "https://git.2f30.org/sbm/") (home-page "https://git.2f30.org/sbm/")
(synopsis "Simple bandwidth monitor") (synopsis "Simple bandwidth monitor")
(description (description
@ -474,12 +512,16 @@ (define-public prout
"1s6c3ygg1h1fyxkh8gd7nzjk6qhnwsb4535d2k780kxnwns5fzas")))) "1s6c3ygg1h1fyxkh8gd7nzjk6qhnwsb4535d2k780kxnwns5fzas"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; No configure script (delete 'configure)))) ; no configure script
(inputs (inputs
`(("cups-minimal" ,cups-minimal) `(("cups-minimal" ,cups-minimal)
("zlib" ,zlib))) ("zlib" ,zlib)))
@ -507,8 +549,12 @@ (define-public noice
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
@ -541,8 +587,12 @@ (define-public human
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; no configure script (delete 'configure)))) ; no configure script
@ -570,8 +620,12 @@ (define-public fortify-headers
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; no tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; no configure script (delete 'configure)))) ; no configure script
@ -610,12 +664,16 @@ (define-public colors
"1lckmqpgj89841splng0sszbls2ag71ggkgr1wsv9y3v6y87589z")))) "1lckmqpgj89841splng0sszbls2ag71ggkgr1wsv9y3v6y87589z"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; No configure script (delete 'configure)))) ; no configure script
(inputs (inputs
`(("libpng" ,libpng))) `(("libpng" ,libpng)))
(home-page "https://git.2f30.org/colors/") (home-page "https://git.2f30.org/colors/")
@ -647,12 +705,16 @@ (define-public libutf
"1ih5vjavilzggyr1j1z6w1z12c2fs5fg77cfnv7ami5ivsy3kg3d")))) "1ih5vjavilzggyr1j1z6w1z12c2fs5fg77cfnv7ami5ivsy3kg3d"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; No configure script (delete 'configure)))) ; no configure script
(inputs (inputs
`(("gawk" ,gawk))) `(("gawk" ,gawk)))
(home-page "https://github.com/cls/libutf") (home-page "https://github.com/cls/libutf")
@ -693,8 +755,12 @@ (define-public lchat
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ; no configure script (delete 'configure) ; no configure script
@ -737,12 +803,16 @@ (define-public scron
"066fwa55kqcgfrsqgxh94sqbkxfsr691360xg4ljxr4i75d25s2a")))) "066fwa55kqcgfrsqgxh94sqbkxfsr691360xg4ljxr4i75d25s2a"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:tests? #f ; No tests `(#:tests? #f ; no tests
#:make-flags (list "CC=gcc" #:make-flags
(string-append "PREFIX=" %output)) (let ((target ,(%current-target-system)))
(list (string-append "CC=" (if target
(string-append target "-gcc")
"gcc"))
(string-append "PREFIX=" %output)))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure)))) ; No configure script (delete 'configure)))) ; no configure script
(home-page "https://git.2f30.org/scron/") (home-page "https://git.2f30.org/scron/")
(synopsis "Simple cron daemon") (synopsis "Simple cron daemon")
(description (description