futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: rgbds: Cross compile.

Browse Source 
* gnu/packages/assembly.scm (rgbds)[arguments]: Use cc-for-target in
make-flags. Add custom phase to use correct pkg-config for target.
This commit is contained in:
Efraim Flashner 2020-11-16 11:59:40 +02:00
parent f6a42ac946
commit 59775c1c79
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/assembly.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com> ;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
;;; Copyright © 2019 Andy Tai <atai@atai.org> ;;; Copyright © 2019 Andy Tai <atai@atai.org>
@ -51,7 +51,7 @@
#:use-module (gnu packages shells) #:use-module (gnu packages shells)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module ((guix utils) #:use-module ((guix utils)
#:select (%current-system))) #:select (%current-system cc-for-target)))
(define-public nasm (define-public nasm
(package (package
@ -276,13 +276,21 @@ runtime")
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) (delete 'configure)
(add-after 'unpack 'patch-pkg-config
(lambda _
(substitute* "Makefile"
(("pkg-config")
(or (which "pkg-config")
(string-append ,(%current-target-system)
"-pkg-config"))))
#t))
(replace 'check (replace 'check
(lambda _ (lambda _
(with-directory-excursion "test/asm" (with-directory-excursion "test/asm"
(invoke "./test.sh")) (invoke "./test.sh"))
(with-directory-excursion "test/link" (with-directory-excursion "test/link"
(invoke "./test.sh"))))) (invoke "./test.sh")))))
#:make-flags `("CC=gcc" #:make-flags `(,(string-append "CC=" ,(cc-for-target))
,(string-append "PREFIX=" ,(string-append "PREFIX="
(assoc-ref %outputs "out"))))) (assoc-ref %outputs "out")))))
(native-inputs (native-inputs