Merge branch 'devel' into 'main'

openpmix 3 is deprecated. for now, test openpmix 4

See merge request glicid-public/guix-glicid!451
This commit is contained in:
Yann Dupont 2025-01-10 11:30:32 +00:00
commit 28190af05b

View file

@ -278,12 +278,12 @@
(string-append "--with-json=" #$(this-package-input "json-c")) (string-append "--with-json=" #$(this-package-input "json-c"))
(string-append "--with-munge=" #$(this-package-input "munge")) (string-append "--with-munge=" #$(this-package-input "munge"))
; (string-append "--with-pmix=" #$(this-package-input "openpmix-3") ":" #$(this-package-input "openpmix-4") ) ; (string-append "--with-pmix=" #$(this-package-input "openpmix-3") ":" #$(this-package-input "openpmix-4") )
(string-append "--with-pmix=" #$(this-package-input "openpmix-3")) ; (string-append "--with-pmix=" #$(this-package-input "openpmix-3"))
(string-append "--with-yaml=" #$(this-package-input "libyaml")) (string-append "--with-yaml=" #$(this-package-input "libyaml"))
(string-append "--with-jwt=" #$(this-package-input "libjwt")) (string-append "--with-jwt=" #$(this-package-input "libjwt"))
(string-append "--with-http-parser=" #$(this-package-input "http-parser")) (string-append "--with-http-parser=" #$(this-package-input "http-parser"))
(string-append "--with-ucx=" #$(this-package-input "ucx")) (string-append "--with-ucx=" #$(this-package-input "ucx"))
; (string-append "--with-pmix=" #$(this-package-input "openpmix-4")) (string-append "--with-pmix=" #$(this-package-input "openpmix-4"))
;; 32-bit support is marked as deprecated and needs to be ;; 32-bit support is marked as deprecated and needs to be
;; explicitly enabled. ;; explicitly enabled.
#$@(if (target-64bit?) '() '("--enable-deprecated"))) #$@(if (target-64bit?) '() '("--enable-deprecated")))