diff options
author | Marius Bakke <marius@gnu.org> | 2022-08-13 18:14:34 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-08-27 23:48:56 +0200 |
commit | 59bbf7e86c8b64850f7572d4af6a9587dfd3d7d0 (patch) | |
tree | 131574021da95746069e8f14dd4fc60dc0f7df14 /gnu/packages/web.scm | |
parent | ada35de38f6b04bbc3c5d0bed198cf22e5fa22d9 (diff) |
gnu: scons: Update to 4.4.0.
* gnu/packages/patches/scons-test-environment.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/build-tools.scm (scons): Update to 4.4.0.
[source](patches): New field.
[arguments]: Adjust bootstrap for the new version. Enable tests.
[native-inputs]: Add PYTHON-WHEEL and PYTHON-PSUTIL.
(scons-3): New variable.
(scons-python2): Inherit from it.
* gnu/packages/web.scm (serf)[arguments]: Stick with SCONS-3 to prevent rebuilds.
Diffstat (limited to 'gnu/packages/web.scm')
-rw-r--r-- | gnu/packages/web.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index aac6bdd5eb..b687e4e3e7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1944,7 +1944,8 @@ from streaming URLs. It is a command-line wrapper for the libquvi library.") ;;("gss" ,gss) zlib)) (arguments - `(#:scons-flags (list (string-append "APR=" (assoc-ref %build-inputs "apr")) + `(#:scons ,scons-3 ;TODO: remove in the next rebuild cycle + #:scons-flags (list (string-append "APR=" (assoc-ref %build-inputs "apr")) (string-append "APU=" (assoc-ref %build-inputs "apr-util")) (string-append "OPENSSL=" (assoc-ref %build-inputs "openssl")) ;; (string-append "GSSAPI=" (assoc-ref %build-inputs "gss")) |