12/15: gnu: Boost: Python input is not native.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 38aafcf958badfa6407ece2bb70c3b8dc70dba5e
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Jul 5 23:08:18 2022 +0200

    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.
---
 gnu/packages/boost.scm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

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