amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cmake: Skip CPack TXZ test on i686.

Browse source 
Fixes <https://issues.guix.gnu.org/50617>.

* gnu/packages/cmake.scm (%common-build-phases): Turn into a procedure
and adjust users.  When 'target-x86-32?' returns true, add
'skip-cpack-txz-test'.
This commit is contained in:
Ludovic Courtès 2021-09-21 10:08:35 +02:00
parent 68933659cb
commit f762d63ec0
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/cmake.scm
View file

@ -92,7 +92,7 @@ using the CMake build system.")
;;; Build phases shared between 'cmake-bootstrap' and the later variants ;;; Build phases shared between 'cmake-bootstrap' and the later variants
;;; that use cmake-build-system. ;;; that use cmake-build-system.
(define %common-build-phases (define (%common-build-phases)
`((add-after 'unpack 'split-package `((add-after 'unpack 'split-package
;; Remove files that have been packaged in other package recipes. ;; Remove files that have been packaged in other package recipes.
(lambda _ (lambda _
@ -100,6 +100,17 @@ using the CMake build system.")
(substitute* "Auxiliary/CMakeLists.txt" (substitute* "Auxiliary/CMakeLists.txt"
((".*cmake-mode.el.*") "")) ((".*cmake-mode.el.*") ""))
#t)) #t))
,@(if (target-x86-32?)
'((add-after 'unpack 'skip-cpack-txz-test
(lambda _
;; In 'RunCMake.CPack_TXZ', the 'TXZ/THREADED_ALL' test
;; would occasionally fail on i686 with "Internal error
;; initializing compression library: Cannot allocate
;; memory": <https://issues.guix.gnu.org/50617>. Skip it.
(substitute* "Tests/RunCMake/CPack/RunCMakeTest.cmake"
(("THREADED_ALL \"TXZ;DEB\"")
"THREADED_ALL \"DEB\"")))))
'())
(add-before 'configure 'patch-bin-sh (add-before 'configure 'patch-bin-sh
(lambda _ (lambda _
;; Replace "/bin/sh" by the right path in... a lot of ;; Replace "/bin/sh" by the right path in... a lot of
@ -188,7 +199,7 @@ using the CMake build system.")
" --exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$"))) " --exclude-regex ^\\(" (string-join skipped-tests "\\|") "\\)$")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
,@%common-build-phases ,@(%common-build-phases)
(add-before 'configure 'set-paths (add-before 'configure 'set-paths
(lambda _ (lambda _
;; Help cmake's bootstrap process to find system libraries ;; Help cmake's bootstrap process to find system libraries
@ -295,7 +306,7 @@ and workspaces that can be used in the compiler environment of your choice.")
#:build-type "Release" #:build-type "Release"
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
,@%common-build-phases ,@(%common-build-phases)
(add-after 'install 'delete-help-documentation (add-after 'install 'delete-help-documentation
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(delete-file-recursively (delete-file-recursively