me
/
guix
Archived
1
0
Fork 0
Code

gnu: Boost: Avoid usage of 'this-package-input'. 

* gnu/packages/boost.scm (boost)[arguments]: Use SEARCH-INPUT-FILE instead of
THIS-PACKAGE-INPUT & co.
(boost-for-mysql)[arguments]: Likewise.
master
Marius Bakke 2022-07-05 23:22:47 +02:00
parent 4fc6175073
commit f12ca428b8
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/boost.scm
View File

@ -126,9 +126,9 @@
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(delete 'bootstrap) (delete 'bootstrap)
(replace 'configure (replace 'configure
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
(let ((icu #$(this-package-input "icu4c")) (let ((icu (dirname (dirname (search-input-file
(python #$(this-package-input "python-minimal-wrapper"))) inputs "bin/uconv")))))
(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")
@ -158,11 +158,14 @@
;; Ditto for Python. ;; Ditto for Python.
#$@(if (%current-target-system) #$@(if (%current-target-system)
#~() #~()
#~((string-append "--with-python-root=" python) #~((let ((python (dirname (dirname (search-input-file
inputs
"bin/python")))))
(string-append "--with-python-root=" python)
(string-append "--with-python=" python (string-append "--with-python=" python
"/bin/python") "/bin/python")
(string-append "--with-python-version=" (string-append "--with-python-version="
(python-version python)))) (python-version python)))))
"--with-toolset=gcc")))) "--with-toolset=gcc"))))
(replace 'build (replace 'build
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key make-flags #:allow-other-keys)
@ -178,9 +181,9 @@
(lambda* (#:key make-flags inputs outputs #:allow-other-keys) (lambda* (#:key make-flags inputs outputs #:allow-other-keys)
(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 (dirname (dirname (search-input-file
#$(this-package-input inputs "bin/python"))))
"python-minimal-wrapper"))) (python-version (python-version python))
(libboost_pythonNN (libboost_pythonNN
(string-append "libboost_python" (string-append "libboost_python"
(string-join (string-split (string-join (string-split
@ -318,7 +321,8 @@ across a broad spectrum of applications.")
#~(modify-phases #$phases #~(modify-phases #$phases
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((icu #$(this-package-input "icu4c"))) (let ((icu (dirname (dirname (search-input-file
inputs "bin/uconv")))))
(substitute* (append (substitute* (append
(find-files "tools/build/src/engine/" "execunix\\.c.*") (find-files "tools/build/src/engine/" "execunix\\.c.*")
'("libs/config/configure" '("libs/config/configure"