From 5f672aaa0ca7e2c5775c8950fa1627ac419e557e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 11 Aug 2023 14:12:00 -0700 Subject: [PATCH] gnu: lcsync: Update to 0.2.1. * gnu/packages/networking.scm (lcsync): Update to 0.2.1. [arguments]: #:configure-flags Pass --prefix. Drop 'remove-network-tests and 'remove-immintrin.h phase. Add 'use-prefix-from-configure-in-doc-makefile phase. [inputs]: Add lcrq. [native-inputs]: Remove simde. Signed-off-by: Christopher Baines --- gnu/packages/networking.scm | 40 +++++++++++++------------------------ 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index dd5cc2a170..02ac607eb6 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -289,7 +289,7 @@ (define-public lcrq (define-public lcsync (package (name "lcsync") - (version "0.0.1") + (version "0.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -298,45 +298,33 @@ (define-public lcsync (file-name (git-file-name name version)) (sha256 (base32 - "0s038b4xg9nlzhrganzjyfvc6n6cgd6kilnpik4axp62j2n5q11q")))) + "0bsd3dkir2i647nmrmyb7skbv16v0f6f3gfwkpxz8g42978dlms5")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f + #:configure-flags + (list + (string-append "--prefix=" + (assoc-ref %outputs "out"))) #:make-flags (let ((target ,(%current-target-system))) (list ,(string-append "CC=" - (cc-for-target)) - ;; avoid running setcap in the install process - "SETCAP_PROGRAM=true" - (string-append "prefix=" - (assoc-ref %outputs "out")))) + (cc-for-target)))) #:test-target "test" #:phases (modify-phases %standard-phases - (delete 'configure) ;no configure script - (add-before 'check 'remove-network-tests + (add-after 'unpack 'use-prefix-from-configure-in-doc-makefile + ;; Use prefix from configure. Fixed upstream: + ;; https://codeberg.org/librecast/lcsync/commit/4ba00f6 + ;; XXX: Remove for 0.2.2+ (lambda _ - ;; these tests require networking - (delete-file "./test/0000-0027.c") - (delete-file "./test/0000-0049.c") - (delete-file "./test/0000-0074.c"))) - (add-after 'unpack 'remove-immintrin.h - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Makefile" - (("CFLAGS :=") - (string-append "CFLAGS := -I" (search-input-directory - inputs "include/simde")))) - (substitute* (find-files "src") - ((".*immintrin\\.h.*") - (string-append "#include \n" - "#include \n")) - (("__m128i") "simde__m128i")))) + (substitute* "doc/Makefile.in" + (("PREFIX .= /usr/local") "PREFIX ?= @prefix@")))) (add-before 'build 'add-library-paths (lambda* (#:key inputs #:allow-other-keys) (let* ((librecast (assoc-ref inputs "librecast"))) (substitute* (list "./src/Makefile" "./test/Makefile") (("-llibrecast") (string-append "-L" librecast "/lib -llibrecast"))))))))) - (inputs (list librecast libsodium)) - (native-inputs (list simde)) + (inputs (list lcrq librecast libsodium)) (home-page "https://librecast.net/lcsync.html") (synopsis "Librecast file and data syncing tool") (description