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: dlib: Fix broken package.

Browse source 
This is a follow-of of commit 830562e5cd.

* gnu/packages/machine-learning.scm (dlib)[arguments]: Replace unquote with
ungexp. Improve style. Fix failing tests with GCC 14.

Change-Id: Ida95405b026893bae26af39cbfc4a0457e2d232c
Signed-off-by: Andreas Enge <andreas@enge.fr>
This commit is contained in:
Romain GARBAGE 2025-11-20 10:58:06 +01:00 • committed by Andreas Enge
parent 12197aa009
commit 96f3df23b7
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/machine-learning.scm
View file

@ -32,6 +32,7 @@
;;; Copyright © 2025 Lapearldot <lapearldot@disroot.org>
;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2025 Romain Garbage <romain.garbage@inria.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -2031,14 +2032,13 @@ than 8 bits, and at the end only some significant 8 bits are kept.")
;; config.h recommends explicitly enabling or disabling asserts
;; when building as a shared library. By default neither is set.
(substitute* "dlib/config.h"
(("^//#define DLIB_DISABLE_ASSERTS") "#define DLIB_DISABLE_ASSERTS"))
#t))
(("^//#define DLIB_DISABLE_ASSERTS") "#define DLIB_DISABLE_ASSERTS"))))
(add-after 'disable-asserts 'disable-failing-tests
(lambda _
;; One test times out on MIPS, so we need to disable it.
;; Others are flaky on some platforms.
(let* ((system ,(or (%current-target-system)
(%current-system)))
(let* ((system #$(or (%current-target-system)
(%current-system)))
(disabled-tests (cond
((string-prefix? "mips64" system)
'("object_detector" ; timeout
@ -2053,6 +2053,17 @@ than 8 bits, and at the end only some significant 8 bits are kept.")
(substitute* "dlib/test/makefile"
(((string-append "SRC \\+= " test "\\.cpp")) "")))
disabled-tests))))
(add-before 'configure 'fix-test-build-error-with-gcc-14.3
(lambda _
(substitute* "dlib/test/CMakeLists.txt"
;; Some flags are activated specifically for GCC 14.0 but they
;; are needed for current GCC version (14.3.0). Let's assume
;; they are needed for the 14.x branch.
(("14\\.0\\.1")
"14.99")
;; Tests use deprecated functions from ffmpeg.
(("-Werror\\)")
"-Werror -Wno-error=deprecated-declarations)"))))
(replace 'check
(lambda _
;; XXX: This causes a rebuild--however, trying to run the tests