diff options
Diffstat (limited to 'gnu/packages/build-tools.scm')
| -rw-r--r-- | gnu/packages/build-tools.scm | 52 |
1 files changed, 15 insertions, 37 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 18a07f0226..437b0d3550 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -155,14 +155,14 @@ generate such a compilation database.") (define-public bmake (package (name "bmake") - (version "20211207") + (version "20211212") (source (origin (method url-fetch) (uri (string-append "http://www.crufty.net/ftp/pub/sjg/bmake-" version ".tar.gz")) (sha256 - (base32 "1cvm10gh7gb0rjcfgbssrw13ha24qmagifgkr53kk39r9693ylq5")))) + (base32 "17lywks7fy5538vwyyvbvxcq5mgnd5si7f2qgw85sgqj7mdr4xdd")))) (build-system gnu-build-system) (inputs (list bash-minimal)) @@ -264,7 +264,7 @@ files and generates build instructions for the Ninja build system.") (define-public meson (package (name "meson") - (version "0.60.0") + (version "0.60.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/mesonbuild/meson/" @@ -272,7 +272,7 @@ files and generates build instructions for the Ninja build system.") version ".tar.gz")) (sha256 (base32 - "0irdn7hx5a182jbvq2kmdwd1v7mljzh5fm27pg4xk879hnv6h388")) + "13mrrizg4vl6n5k7fz6amyafnn3i097dcarr552qc0ca6nlmzjl7")) (patches (search-patches "meson-allow-dirs-outside-of-prefix.patch")))) (build-system python-build-system) @@ -283,38 +283,6 @@ files and generates build instructions for the Ninja build system.") #:phases (modify-phases %standard-phases ;; Meson calls the various executables in out/bin through the ;; Python interpreter, so we cannot use the shell wrapper. - (delete 'wrap)))) - (inputs (list ninja)) - - ;; XXX: Python is propagated just to 'GUIX_PYTHONPATH' is set (!). - ;; MESON-WRAPPED below fixes that by wrapping the 'meson' executable. - ;; TODO: Make MESON-WRAPPED the new MESON on the next core update cycle. - (propagated-inputs (list python)) - - (home-page "https://mesonbuild.com/") - (properties '((hidden? . #t))) - (synopsis "Build system designed to be fast and user-friendly") - (description - "The Meson build system is focused on user-friendliness and speed. -It can compile code written in C, C++, Fortran, Java, Rust, and other -languages. Meson provides features comparable to those of the -Autoconf/Automake/make combo. Build specifications, also known as @dfn{Meson -files}, are written in a custom domain-specific language (@dfn{DSL}) that -resembles Python.") - (license license:asl2.0))) - -(define-public meson-wrapped - (package/inherit meson - (propagated-inputs '()) ;don't propagate Python - (inputs (modify-inputs (package-inputs meson) - (prepend python-wrapper))) - (arguments - `(;; FIXME: Tests require many additional inputs and patching many - ;; hard-coded file system locations in "run_unittests.py". - #:tests? #f - #:phases (modify-phases %standard-phases - ;; Meson calls the various executables in out/bin through the - ;; Python interpreter, so we cannot use the shell wrapper. (replace 'wrap (lambda* (#:key outputs inputs #:allow-other-keys) (let ((python-version @@ -327,7 +295,17 @@ import sys sys.path.insert(0, '~a/lib/python~a/site-packages') # EASY-INSTALL-ENTRY-SCRIPT" output python-version))))))))) - (properties '()))) + (inputs (list python-wrapper ninja)) + (home-page "https://mesonbuild.com/") + (synopsis "Build system designed to be fast and user-friendly") + (description + "The Meson build system is focused on user-friendliness and speed. +It can compile code written in C, C++, Fortran, Java, Rust, and other +languages. Meson provides features comparable to those of the +Autoconf/Automake/make combo. Build specifications, also known as @dfn{Meson +files}, are written in a custom domain-specific language (@dfn{DSL}) that +resembles Python.") + (license license:asl2.0))) ;;; This older Meson variant is kept for now for gtkmm and others that may ;;; have problems with 0.60. |