amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system: android-ndk: Improve lower configurability.

Browse source 
* guix/build-system/android-ndk.scm (default-android-build,
default-android-googletest): Add and export variables.
  (lower): Add their respective keywords.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Nicolas Graves 2025-07-08 01:47:58 +02:00 • committed by Ludovic Courtès
parent 9073a7e410
commit fcdcfa149d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
guix/build-system/android-ndk.scm
View file

@ -26,7 +26,9 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix build-system) #:use-module (guix build-system)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:export (android-ndk-build-system)) #:export (android-ndk-build-system
default-android-build
default-android-googletest))
(define %android-ndk-build-system-modules (define %android-ndk-build-system-modules
;; Build-side modules imported by default. ;; Build-side modules imported by default.
@ -91,12 +93,15 @@
(define* (lower name (define* (lower name
#:key source inputs native-inputs outputs system target #:key source inputs native-inputs outputs system target
(android-build (default-android-build))
(android-googletest (default-android-googletest))
#:allow-other-keys #:allow-other-keys
#:rest arguments) #:rest arguments)
"Return a bag for NAME." "Return a bag for NAME."
(define private-keywords (define private-keywords
'(#:target #:inputs #:native-inputs #:outputs)) '(#:target #:inputs #:native-inputs #:outputs
#:android-build #:android-googletest))
(and (not target) ;; TODO: support cross-compilation (and (not target) ;; TODO: support cross-compilation
(bag (bag
@ -110,8 +115,8 @@
;; Keep the standard inputs of 'gnu-build-system' ;; Keep the standard inputs of 'gnu-build-system'
,@(standard-packages))) ,@(standard-packages)))
(build-inputs `(("android-build" ,(default-android-build)) (build-inputs `(("android-build" ,android-build)
("android-googletest" ,(default-android-googletest)) ("android-googletest" ,android-googletest)
,@native-inputs)) ,@native-inputs))
(outputs outputs) (outputs outputs)
(build android-ndk-build) (build android-ndk-build)