diff options
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/cmake.scm | 32 | ||||
| -rw-r--r-- | guix/build-system/meson.scm | 2 | ||||
| -rw-r--r-- | guix/build-system/qt.scm | 31 |
3 files changed, 47 insertions, 18 deletions
diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 8b1889e36b..b0587fddf0 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -31,7 +31,9 @@ #:use-module (guix packages) #:export (%cmake-build-system-modules cmake-build - cmake-build-system)) + cmake-build-system + default-cmake + default-ninja)) ;; Commentary: ;; @@ -64,10 +66,17 @@ 'cmake-minimal-cross 'cmake-minimal)))) +(define (default-ninja) + "Return the default ninja package." + ;; Lazily resolve the binding to avoid a circular dependency. + (let ((module (resolve-interface '(gnu packages ninja)))) + (module-ref module 'ninja/pinned))) + (define* (lower name #:key source inputs native-inputs outputs system target (implicit-inputs? #t) (implicit-cross-inputs? #t) (cmake (default-cmake target)) + (ninja (default-ninja)) #:allow-other-keys #:rest arguments) "Return a bag for NAME." @@ -84,6 +93,7 @@ `(("source" ,source)) '()) ,@`(("cmake" ,cmake)) + ,@`(("ninja" ,ninja)) ,@native-inputs ,@(if target '() inputs) ,@(if (and target implicit-cross-inputs?) @@ -115,9 +125,12 @@ (search-paths '()) (make-flags ''()) (out-of-source? #t) + (generator "Unix Makefiles") (build-type "RelWithDebInfo") (tests? #t) - (test-target "test") + (test-exclude "") + (test-repeat-until-pass? #t) + (test-repeat-until-pass-count 5) (parallel-build? #t) (parallel-tests? #t) (validate-runpath? #t) (patch-shebangs? #t) @@ -155,9 +168,12 @@ provides a 'CMakeLists.txt' file as its build system." configure-flags) #:make-flags #$make-flags #:out-of-source? #$out-of-source? + #:generator #$generator #:build-type #$build-type #:tests? #$tests? - #:test-target #$test-target + #:test-exclude #$test-exclude + #:test-repeat-until-pass? #$test-repeat-until-pass? + #:test-repeat-until-pass-count #$test-repeat-until-pass-count #:parallel-build? #$parallel-build? #:parallel-tests? #$parallel-tests? #:validate-runpath? #$validate-runpath? @@ -193,9 +209,12 @@ provides a 'CMakeLists.txt' file as its build system." (native-search-paths '()) (make-flags ''()) (out-of-source? #t) + (generator "Unix Makefiles") (build-type "RelWithDebInfo") (tests? #f) ; nothing can be done - (test-target "test") + (test-exclude "") + (test-repeat-until-pass? #t) + (test-repeat-until-pass-count 5) (parallel-build? #t) (parallel-tests? #t) (validate-runpath? #t) (patch-shebangs? #t) @@ -256,9 +275,12 @@ build system." configure-flags)) #:make-flags #$make-flags #:out-of-source? #$out-of-source? + #:generator #$generator #:build-type #$build-type #:tests? #$tests? - #:test-target #$test-target + #:test-exclude #$test-exclude + #:test-repeat-until-pass? #$test-repeat-until-pass? + #:test-repeat-until-pass-count #$test-repeat-until-pass-count #:parallel-build? #$parallel-build? #:parallel-tests? #$parallel-tests? #:validate-runpath? #$validate-runpath? diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 5eeeb59e65..612e148fb6 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -137,7 +137,7 @@ TRIPLET." "Return the default ninja package." ;; Lazily resolve the binding to avoid a circular dependency. (let ((module (resolve-interface '(gnu packages ninja)))) - (module-ref module 'ninja))) + (module-ref module 'ninja/pinned))) (define (default-meson) "Return the default meson package." diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index d1f721c54e..84e008bfe7 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -61,13 +61,6 @@ (guix build qt-utils) ,@%cmake-build-system-modules)) -(define (default-cmake) - "Return the default CMake package." - - ;; Do not use `@' to avoid introducing circular dependencies. - (let ((module (resolve-interface '(gnu packages cmake)))) - (module-ref module 'cmake-minimal))) - (define (default-qtbase) "Return the default qtbase package." @@ -79,7 +72,8 @@ ;; the variables defined here. (define* (lower name #:key source inputs native-inputs outputs system target - (cmake (default-cmake)) + (cmake (default-cmake target)) + (ninja (default-ninja)) (qtbase (default-qtbase)) #:allow-other-keys #:rest arguments) @@ -96,6 +90,7 @@ `(("source" ,source)) '()) ,@`(("cmake" ,cmake)) + ,@`(("ninja" ,ninja)) ,@`(("qtbase" ,qtbase)) ,@native-inputs ,@(if target @@ -128,9 +123,12 @@ (search-paths '()) (make-flags ''()) (out-of-source? #t) + (generator "Unix Makefiles") (build-type "RelWithDebInfo") (tests? #t) - (test-target "test") + (test-exclude "") + (test-repeat-until-pass? #t) + (test-repeat-until-pass-count 5) (parallel-build? #t) (parallel-tests? #t) (validate-runpath? #t) (patch-shebangs? #t) @@ -168,9 +166,12 @@ provides a 'CMakeLists.txt' file as its build system." #:configure-flags #$configure-flags #:make-flags #$make-flags #:out-of-source? #$out-of-source? + #:generator #$generator #:build-type #$build-type #:tests? #$tests? - #:test-target #$test-target + #:test-exclude #$test-exclude + #:test-repeat-until-pass? #$test-repeat-until-pass? + #:test-repeat-until-pass-count #$test-repeat-until-pass-count #:parallel-build? #$parallel-build? #:parallel-tests? #$parallel-tests? #:validate-runpath? #$validate-runpath? @@ -205,9 +206,12 @@ provides a 'CMakeLists.txt' file as its build system." (native-search-paths '()) (make-flags ''()) (out-of-source? #t) + (generator "Unix Makefiles") (build-type "RelWithDebInfo") (tests? #f) ; nothing can be done - (test-target "test") + (test-exclude "") + (test-repeat-until-pass? #t) + (test-repeat-until-pass-count 5) (parallel-build? #t) (parallel-tests? #f) (validate-runpath? #t) (patch-shebangs? #t) @@ -258,9 +262,12 @@ build system." #:configure-flags #$configure-flags #:make-flags #$make-flags #:out-of-source? #$out-of-source? + #:generator #$generator #:build-type #$build-type #:tests? #$tests? - #:test-target #$test-target + #:test-exclude #$test-exclude + #:test-repeat-until-pass? #$test-repeat-until-pass? + #:test-repeat-until-pass-count #$test-repeat-until-pass-count #:parallel-build? #$parallel-build? #:parallel-tests? #$parallel-tests? #:validate-runpath? #$validate-runpath? |