From patchwork Fri Aug 11 21:12:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 52762 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9B8CC27BBE2; Fri, 11 Aug 2023 22:13:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2293027BBE9 for ; Fri, 11 Aug 2023 22:13:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUZRR-0007Ug-PW; Fri, 11 Aug 2023 17:13:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUZRO-0007Tp-NG for guix-patches@gnu.org; Fri, 11 Aug 2023 17:13:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qUZRO-0005BX-FP for guix-patches@gnu.org; Fri, 11 Aug 2023 17:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUZRO-00084W-Al for guix-patches@gnu.org; Fri, 11 Aug 2023 17:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65233] [PATCH 2/2] gnu: lcsync: Update to 0.2.1. Resent-From: vagrant@debian.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Aug 2023 21:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65233 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 65233@debbugs.gnu.org Cc: vagrant@debian.org Received: via spool by 65233-submit@debbugs.gnu.org id=B65233.169178834830905 (code B ref 65233); Fri, 11 Aug 2023 21:13:02 +0000 Received: (at 65233) by debbugs.gnu.org; 11 Aug 2023 21:12:28 +0000 Received: from localhost ([127.0.0.1]:48169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUZQq-00082G-6h for submit@debbugs.gnu.org; Fri, 11 Aug 2023 17:12:28 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:42238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUZQn-00081k-Ev for 65233@debbugs.gnu.org; Fri, 11 Aug 2023 17:12:26 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 946F91ACDF; Fri, 11 Aug 2023 14:12:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1691788338; bh=28a2KY79YggkN1M0OhtbVlgMAdTufx+rWBs1Q3iQaHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RU96pLK1vR8XBphaTxZUV0J8ToGSxRvR6t27eBrGgguQ4TLc5F+9IYmPqD5C5yD9n jXifR8OTPmOxNy9WJ33B9xy7SUcSDYY7NqdZ/ITLHn2RuUa4p+kQky+rhTsR6qZoYP 0bCvDO5eOu52peXkKGYSWcLScWQx8aNTv+XaWUGLjHS7tOzvZGP/DW4L0i+e0BLbeR JWqzUbC9eJDYFt4elFDKtN/Josvw1TLmKIf/t+WtWg6kdvA4el71/PxugKjXuhSeW/ c/mPNbrw81FrDsOqqKc9XmTXVMGlnNm56sYdnb25Fn/rahaLzMswqeSvLyzVRKWiFz f74/Z/+T1bTcg== From: vagrant@debian.org Date: Fri, 11 Aug 2023 14:12:00 -0700 Message-Id: <20230811211200.15605-2-vagrant@debian.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230811211200.15605-1-vagrant@debian.org> References: <20230811211200.15605-1-vagrant@debian.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Vagrant Cascadian * 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. --- 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 a94e26dd10..a97a3efb12 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