bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 12:05:19 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: boost: Fix build on non-x86_64 non-mingw32.

Browse source 
* gnu/packages/boost.scm (boost)[arguments]<#:make-flags>: Fix build.
(boost-1.83)[arguments]<#:make-flags>: Keep constant.

Fixes: guix/guix#4541
Change-Id: I619eadeacd3b1bf1c8b2c537f445c7e74ceeb127
Signed-off-by: Andreas Enge <andreas@enge.fr>
This commit is contained in:
Danny Milosavljevic 2025-11-29 10:21:53 +01:00 • committed by Andreas Enge
parent 2efb4f3bd4
commit 5270da7968
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
1 changed files with 69 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
gnu/packages/boost.scm
View file

@ -126,16 +126,54 @@
"binary-format=elf"
"target-os=linux"
#$@(cond
((string-prefix? "x86_64" (%current-target-system))
#~()) ; Implies boost.stacktrace.from_exception=on
;;; Note: With llvm's libc++, enabling that for
;;; non-x86_64 non-mingw32 would be a bad idea.
;;; libc++'s backtrace is not thread-safe and
;;; would leak then.
;;;
;;; We disable it here completely. Alternatively,
;;; we could disable it only if the user used
;;; (package-with-c-toolchain ... clang) or
;;; otherwise has libc++ in their dependencies.
;;;
;;; In the latter case, we would have to set
;;; BOOST_STACKTRACE_LIBCXX_RUNTIME_MAY_CAUSE_MEMORY_LEAK
;;; and that seems ill-advised (if a future
;;; update broke it in other ways, we would
;;; be blind to it).
;;;
;;; See also:
;;; <https://codeberg.org/guix/guix/issues/4541>.
((string-prefix? "arm" (%current-target-system))
#~("abi=aapcs"
"address-model=32"
"architecture=arm"))
"architecture=arm"
;; See also:
;; <https://codeberg.org/guix/guix/issues/4541>.
"boost.stacktrace.from_exception=off"))
((string-prefix? "aarch64" (%current-target-system))
#~("abi=aapcs"
"address-model=64"
"architecture=arm"))
(else #~())))
#~()))
"architecture=arm"
;; See also:
;; <https://codeberg.org/guix/guix/issues/4541>.
"boost.stacktrace.from_exception=off"))
(else
;; See also:
;; <https://codeberg.org/guix/guix/issues/4541>.
#~("boost.stacktrace.from_exception=off"))))
;; Not cross-compiling.
#~(#$@(cond
((string-suffix? "mingw32" (%current-system))
#~()) ; Implies boost.stacktrace.from_exception=on
((string-prefix? "x86_64" (%current-system))
#~()) ; Implies boost.stacktrace.from_exception=on
(else
;; See also:
;; <https://codeberg.org/guix/guix/issues/4541>.
#~("boost.stacktrace.from_exception=off"))))))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-shells
@ -217,7 +255,33 @@ across a broad spectrum of applications.")
(patch-flags '("-p2"))
(sha256
(base32
"13iviiwk1srpw9dmiwabkxv56v0pl0zggjp8zxy1419k5zzfsy34")))))))
"13iviiwk1srpw9dmiwabkxv56v0pl0zggjp8zxy1419k5zzfsy34"))))
(arguments
(substitute-keyword-arguments (package-arguments boost)
((#:make-flags _ #f)
#~(list "threading=multi" "link=shared"
;; Set the RUNPATH to $libdir so that the libs find each other.
(string-append "linkflags=-Wl,-rpath="
#$output "/lib")
#$@(if (%current-target-system)
#~("--user-config=user-config.jam"
;; Python is not supported when cross-compiling.
"--without-python"
"binary-format=elf"
"target-os=linux"
#$@(cond
((string-prefix? "arm" (%current-target-system))
#~("abi=aapcs"
"address-model=32"
"architecture=arm"))
((string-prefix? "aarch64" (%current-target-system))
#~("abi=aapcs"
"address-model=64"
"architecture=arm"))
(else
#~())))
;; Not cross-compiling.
#~()))))))))
(define-deprecated-package boost-with-python3
boost)