From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WJNRBFob5WToFwEASxT56A (envelope-from ) for ; Tue, 22 Aug 2023 22:32:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id +K86BFob5WRuegAAauVa8A (envelope-from ) for ; Tue, 22 Aug 2023 22:32:26 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 721836FF37 for ; Tue, 22 Aug 2023 22:32:25 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=egXXEmnZ; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692736345; a=rsa-sha256; cv=none; b=QGBJoGPDkItxdrJj6wPkK+8eISU9kHFKXQtKlnP62XfGb1uHT5MVDNQQwfrDk6dy4VAV54 4p6bYH8ox0cgKGF5kLeFBU2FxMm2TPhsTysNZ/1ZonipQ8a/ZhTfopVuzEQEwOjnxAiA5y OPncoVAX0rvG3ZVqcdNRjVFH1HSX08nkdIVGgi70mxvy4DtXbktBObA3d4gNOAs4eWYEUr LJQv+kUqnXC5EL6JGBpfYOFqPqyAcewbOha1gpEG3CqzgUPH8ZDk2/p1zrbZRDMW7ie/cO VitJgXJvnwysj4LUJScTAof0carQ0z8Kl+F6n0TGRDX/oUrd+dW7TnHduYz7pw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=egXXEmnZ; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692736345; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=X4NSAkLSAzUKEvtg1pG0UIBQncT01fBNxAIoYOYr+cA=; b=IVtVZqqT8tYW53bT4QCeHFrrX2UuojS71acPnbhBm3TqFng2zzNJHJNWmGau6K4v+F7tbo P/7m5b9OB+qYEBMSWkPtbqUUTsF45NJw3GxuJjHd/1fMy7n4Culybk2jHJVf9MmMV7Zx2L Ep8MTne5Jv7m+bmTaosIXQ1R2YHIVTnqZxyO89rfr0hqLZZkLwhyjZPEhN+uQ2/zNfdNdY Pzap1i9zwurvZWcrU9IDu+lW5mCnfEqgHHFGM+y7BfmmUiFdpUFDzCQm6Gk/IeBjsJQlH0 Xrg6UrtGmFILgxfFtXDxQZP46nG/X+Ym4ZwYoSW6DrmGOB9fk0gTmvectF/iWg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYY2j-0001xp-5M; Tue, 22 Aug 2023 16:32:01 -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 1qYY2h-0001xT-M0 for guix-patches@gnu.org; Tue, 22 Aug 2023 16:31:59 -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 1qYY2h-0004rh-Dy for guix-patches@gnu.org; Tue, 22 Aug 2023 16:31:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYY2k-0007ep-2s for guix-patches@gnu.org; Tue, 22 Aug 2023 16:32: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: Tue, 22 Aug 2023 20:32: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.169273631829419 (code B ref 65233); Tue, 22 Aug 2023 20:32:02 +0000 Received: (at 65233) by debbugs.gnu.org; 22 Aug 2023 20:31:58 +0000 Received: from localhost ([127.0.0.1]:60526 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYY2f-0007eQ-Vc for submit@debbugs.gnu.org; Tue, 22 Aug 2023 16:31:58 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:50012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYY2c-0007dv-2E for 65233@debbugs.gnu.org; Tue, 22 Aug 2023 16:31:56 -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 D4DDF1AD89; Tue, 22 Aug 2023 13:31:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1692736304; bh=FowWDGTDeQIn7rjGox7X1VMbuS8GuztqYVjlUptmnHA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=egXXEmnZ1h+ZtX+XZSjB1y3bELH0DnYw81uRsFO6bVBDsvLwrzBlzYTj0HGI5HtL6 QOCVozplom58cthSj7Uaa6DeDhiTVdqJEsHxKcEBfn+ua4eLBOin6x0AtYMQJ/vr0J ye8GQA+57yFpm/13AlwYHsttSOVnpOncVEFlWRPZnpDWeST2PjxpmmT6r6MI244Mr6 rdwiHQevR1BLfuP8cb6BKuPrZVnaJjiZ/l0zaPv+2ceIK9HYT+nPVaO/jMONmJJk5g xrQdHRReEzNvIvX0PaqgWBlcI/yy/HLg1cJby63KkcKsvMVvA8Gq3lq1Agq0cXuLc1 UQlGsIwf0TfdA== From: vagrant@debian.org Date: Tue, 22 Aug 2023 13:31:20 -0700 Message-Id: <20230822203120.295325-2-vagrant@debian.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230822203120.295325-1-vagrant@debian.org> References: <20230822203120.295325-1-vagrant@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx0.migadu.com X-Spam-Score: -3.70 X-Migadu-Queue-Id: 721836FF37 X-Migadu-Spam-Score: -3.70 X-TUID: eaIifn2U94lX 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 2b2e2bd4a5..50de871e82 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 -- 2.39.2