From 37ff509ce626aeb51dcb798ff7a1366dea74d3bd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 9 Jun 2024 00:21:03 -0400 Subject: [PATCH] gnu: bcunit: Update to 5.3.57. * gnu/packages/linphone.scm (bcunit): Update to 5.3.57. [source]: Update origin URI. [outputs]: Delete field. [arguments] : Update to reflect changes in version 5. Use gexps. Delete move-doc phases. {check}: Honor #:tests?. Change-Id: Ic7a67e1ef0841aec5a1ecce3c406ccd90010270f --- gnu/packages/linphone.scm | 118 ++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 62 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 9b84a5b3a9a645409dcf56b23e95f023611f0a81..5e0d9a280c549b3e4bd2f671f472a11435757358 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -62,70 +62,64 @@ #:use-module (guix build-system qt)) (define-public bcunit - (let ((commit "74021cc7cb20a4e177748dd2948173e1f9c270ae") - (revision "0")) - (package - (name "bcunit") - (version (git-version "3.0.2" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "git://git.linphone.org/bcunit") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0npdwvanjkfg9vrqs5yi8vh6wliv50ycdli8pzavir84nb31nq1b")))) - (build-system cmake-build-system) - (outputs '("out" "doc")) - (arguments - `(#:configure-flags (list "-DENABLE_STATIC=NO" - "-DENABLE_CURSES=ON" - "-DENABLE_DOC=ON" - "-DENABLE_EXAMPLES=ON" - "-DENABLE_TEST=ON" - "-DENABLE_MEMTRACE=ON") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda _ - ;; Include BCunit headers for examples. - (substitute* "Examples/CMakeLists.txt" - (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}") - (string-append "${CMAKE_CURRENT_SOURCE_DIR} " - "${PROJECT_SOURCE_DIR}/BCUnit/Headers " - "${CMAKE_BINARY_DIR}/BCUnit/Headers"))) - ;; Link bcunit and bcunit_tests libraries. - (substitute* "BCUnit/Sources/CMakeLists.txt" - (("target_include_directories\\(bcunit_test PUBLIC Test\\)") - (string-append - "target_include_directories(bcunit_test PUBLIC Test)\n" - "target_link_libraries(bcunit_test bcunit)"))))) - (replace 'check - (lambda _ - (with-directory-excursion "BCUnit/Sources/Test" - (invoke "./test_bcunit")))) - (add-after 'install 'move-doc - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (for-each mkdir-p - `(,(string-append doc "/share/doc") - ,(string-append doc "/share/BCUnit"))) - (rename-file - (string-append out "/share/doc/BCUnit") - (string-append doc "/share/doc/BCUnit")) - (rename-file - (string-append out "/share/BCUnit/Examples") - (string-append doc "/share/BCUnit/Examples")))))))) - (inputs - (list ncurses)) - (synopsis "Belledonne Communications Unit Testing Framework") - (description "BCUnit is a fork of the defunct project CUnit, with + (package + (name "bcunit") + (version "5.3.57") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/bcunit.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02aqc8052vidc8ylkwiv2rqddl58fccrjz561j8zfqlwm2irnsg3")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" + "-DENABLE_BCUNIT_CURSES=ON" + "-DENABLE_BCUNIT_DOC=ON" + "-DENABLE_BCUNIT_EXAMPLES=ON" + "-DENABLE_BCUNIT_TEST=ON" + "-DENABLE_BCUNIT_MEMTRACE=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; Include BCunit headers for examples. + (substitute* "Examples/CMakeLists.txt" + (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}") + (string-append "${CMAKE_CURRENT_SOURCE_DIR} " + "${PROJECT_SOURCE_DIR}/BCUnit/Headers " + "${CMAKE_BINARY_DIR}/BCUnit/Headers"))) + ;; Link bcunit and bcunit_tests libraries. + (substitute* "BCUnit/Sources/CMakeLists.txt" + (("target_include_directories\\(bcunit_test PUBLIC Test\\)") + (string-append + "target_include_directories(bcunit_test PUBLIC Test)\n" + "\ttarget_link_libraries(bcunit_test bcunit)"))))) + (add-after 'install 'patch-BCUnitConfig.cmake + (lambda _ + (substitute* (string-append + #$output "/share/BCUnit/cmake/BCUnitConfig.cmake") + ;; This is only added for convenience when doing static builds. + ;; Since this is not a common case, avoid the find_dependency on + ;; ncurses, which would require propagating it. + (("find_dependency\\(Curses)") + "")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "BCUnit/Sources/Test" + (invoke "./test_bcunit")))))))) + (inputs (list ncurses)) + (synopsis "Belledonne Communications Unit Testing Framework") + (description "BCUnit is a fork of the defunct project CUnit, with several fixes and patches applied. It is a unit testing framework for writing, administering, and running unit tests in C.") - (home-page "https://gitlab.linphone.org/BC/public/bcunit") - (license license:lgpl2.0+)))) + (home-page "https://gitlab.linphone.org/BC/public/bcunit") + (license license:lgpl2.0+))) (define-public bctoolbox (package