me
/
guix
Archived
1
0
Fork 0
Code

gnu: Boost: Python input is not native. 

Even though it is not referenced, and not used when cross-compiling, the
architecture should match.

* gnu/packages/boost.scm (boost)[native-inputs]: Move PYTHON-MINIMAL-WRAPPER ...
[inputs]: ... here.
* gnu/packages/boost.scm (boost-for-mysql)[native-inputs, inputs]: Adjust
accordingly.
master
Marius Bakke 2022-07-05 23:08:18 +02:00
parent 526071290f
commit 38aafcf958
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/boost.scm
View File

@ -84,12 +84,14 @@
(base32 (base32
"0fggarccddj6q4ifj3kn7g565rbhn4ia1vd45fxb7y57a6fmhpa7")))) "0fggarccddj6q4ifj3kn7g565rbhn4ia1vd45fxb7y57a6fmhpa7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (list icu4c zlib)) (inputs
(append
(list icu4c zlib)
(if (%current-target-system)
'()
(list python-minimal-wrapper))))
(native-inputs (native-inputs
(append (list perl tcsh) (list perl tcsh))
(if (%current-target-system)
'()
(list python-minimal-wrapper))))
(arguments (arguments
(list (list
#:imported-modules `((guix build python-build-system) #:imported-modules `((guix build python-build-system)
@ -126,7 +128,7 @@
(replace 'configure (replace 'configure
(lambda _ (lambda _
(let ((icu #$(this-package-input "icu4c")) (let ((icu #$(this-package-input "icu4c"))
(python #+(this-package-native-input "python-minimal-wrapper"))) (python #$(this-package-input "python-minimal-wrapper")))
(substitute* '("libs/config/configure" (substitute* '("libs/config/configure"
"libs/spirit/classic/phoenix/test/runtest.sh" "libs/spirit/classic/phoenix/test/runtest.sh"
"tools/build/src/engine/execunix.cpp") "tools/build/src/engine/execunix.cpp")
@ -177,7 +179,7 @@
(let* ((static? (member "link=static" make-flags)) (let* ((static? (member "link=static" make-flags))
(libext (if static? ".a" ".so")) (libext (if static? ".a" ".so"))
(python-version (python-version (python-version (python-version
#+(this-package-native-input #$(this-package-input
"python-minimal-wrapper"))) "python-minimal-wrapper")))
(libboost_pythonNN (libboost_pythonNN
(string-append "libboost_python" (string-append "libboost_python"
@ -345,8 +347,8 @@ across a broad spectrum of applications.")
(delete 'provide-libboost_python))) (delete 'provide-libboost_python)))
((#:make-flags make-flags) ((#:make-flags make-flags)
#~(cons* "--without-python" #$make-flags)))) #~(cons* "--without-python" #$make-flags))))
(native-inputs (inputs
(modify-inputs (package-native-inputs boost) (modify-inputs (package-inputs boost)
(delete "python-minimal-wrapper"))) (delete "python-minimal-wrapper")))
(properties '((hidden? . #t))))) (properties '((hidden? . #t)))))