From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id oIcZN/ZFEGcDQwAA62LTzQ:P1 (envelope-from ) for ; Wed, 16 Oct 2024 23:02:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id oIcZN/ZFEGcDQwAA62LTzQ (envelope-from ) for ; Thu, 17 Oct 2024 01:02:15 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RlhSqlUv; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=navjYuHw; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1729119734; h=from:from:sender:sender:reply-to: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=z6URux1MzL3pvljitZ/LKX6aoBNqNWANHEoxu9ULDSs=; b=hzMzbLx99xjyxNz4E3PaBXJVa9jS0EimFeu5XIqN9CAPkVaLIwgXXRqximmtPyKz9D5hPQ AAyghj9Kg4gqEZZrbDXt+VsDWGW1bJ/iMLjdSSPceA5zbWr+SXDGYq0CF1X/53K7VOO+Za FouP6y8FJCouSeqNfBYHSq94izAof5deK3qTmHY8vV0brxGgwQZN4gTFa25yrqwb0xDJ5T SblByvKGh4vd6lGtK6twdgLyFp/Ya8TsrYiql1dHIAC9wdLN78aAWtjgMs00CFsZgdqXvY 5qr2H9jLihlulrtrXU6dkamcPvBHM5SGfQ9gjbe5I2u2vy+ZG3F1/UHUcL65qQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1729119734; a=rsa-sha256; cv=none; b=IGqvNH3NQIt7TjRswfL9eqRkhVS8VglhTJOjNH2k7YkEvBV/LQnUspmqQp3HGDy/jdbFJr XNns7bJz+ev3XzbZEGfjKPwBNlMKXq7bKAcjSDap4wGOeXTRfWY+/wf6p96xD0wzBNX7NW +ZIBrYT1kzus8ba1r3GTJUHE5RuU0PsLnFv+Rz15kaM5nkcIz3Axi7S331zsm3lpofo1Ek QZk/9Q56BT5rT5gebrmnVT1sLHvzpwZaMUtU4SRaDHNU0EW+XO/5pf+MB0IHITPEL9zNag O/xyBV2gQuez1fMVaCEJ4pZiHCCT3U81+rbJgi05hHfw4D+gZaXSdKDAGJ+sfA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RlhSqlUv; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=navjYuHw; 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=pass (policy=none) header.from=gnu.org 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 62CA858124 for ; Thu, 17 Oct 2024 01:02:13 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1D1b-0000QU-HM; Wed, 16 Oct 2024 19:01:51 -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 1t1D1T-0000PL-FB for guix-patches@gnu.org; Wed, 16 Oct 2024 19:01:44 -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 1t1D1T-0003vu-51 for guix-patches@gnu.org; Wed, 16 Oct 2024 19:01:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=z6URux1MzL3pvljitZ/LKX6aoBNqNWANHEoxu9ULDSs=; b=RlhSqlUvVcXv+oJ502RX+2rzhpeDjdAowVFKjsd5udJ8VfihacD5VUCbdGu6/qvdhkfE8F80R8oK4pLIKNkzSQOZghYAx+afxGdBxCGh/M+iYMjwOlZFHB6jI4GER4FWguOaCKVa2xuJEoez+SZSTGs17ke1zsZR81QiBJflAXVgRfzPPms3rY+JwUPBuqrPz+YFnzD+/cKi1yWC9Msu8XC2NHAiveRbd8sr8rL4z12/84nme5D2EV0NtcP6MlCNy1lx4q6lfOV6nTf2EonPi/cLPygoZ8G+R76pDLFLANNk+2ss27T6ueh3k/Vpvnye8jSEhx5qVJeXDz7ftaIEsQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t1D1m-0002C9-Li for guix-patches@gnu.org; Wed, 16 Oct 2024 19:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH v3 3/3] gnu: varnish: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Oct 2024 23:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73682 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73682@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 73682-submit@debbugs.gnu.org id=B73682.17291196838345 (code B ref 73682); Wed, 16 Oct 2024 23:02:02 +0000 Received: (at 73682) by debbugs.gnu.org; 16 Oct 2024 23:01:23 +0000 Received: from localhost ([127.0.0.1]:60830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1D14-0002AR-TB for submit@debbugs.gnu.org; Wed, 16 Oct 2024 19:01:23 -0400 Received: from 15.mo583.mail-out.ovh.net ([178.33.107.29]:43601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1D0x-00029o-J5 for 73682@debbugs.gnu.org; Wed, 16 Oct 2024 19:01:16 -0400 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.2.251]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4XTRJy02Qfz1J4p for <73682@debbugs.gnu.org>; Wed, 16 Oct 2024 23:00:49 +0000 (UTC) Received: from ghost-submission-55b549bf7b-jp7j2 (unknown [10.110.96.50]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A50441FE45; Wed, 16 Oct 2024 23:00:49 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-55b549bf7b-jp7j2 with ESMTPSA id T/zXEaFFEGc3KAAAgeqroA (envelope-from ); Wed, 16 Oct 2024 23:00:49 +0000 X-OVh-ClientIp: 90.110.172.34 Date: Thu, 17 Oct 2024 01:00:42 +0200 Message-ID: <20241016230045.1878-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241016230045.1878-1-ngraves@ngraves.fr> References: <20241016230045.1878-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 5017291461153579746 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehtddgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddruddutddrudejvddrfeegpdefjedrheelrddugedvrddutdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejfeeikedvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=z6URux1MzL3pvljitZ/LKX6aoBNqNWANHEoxu9ULDSs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729119650; v=1; b=navjYuHwBn8qonERp+7rzJRtH+GxQVqgKubaS7rEVl003QWLNEsC+2HeX4HnpucrcsYsvefK jCtRhayHCih8GZhGCbJO4HTZz+3F2fk6zAJqqKzMNvw5aSGmtAZmTiQPAdFMNlo2sdgekU7q9Lm z7xdxMNaS+qf92ejzDl4USYw5XYY3I7JS/l0Xl25axxEQApxm657OOyBe9f4FEpbqaax7hE8x2l ZDA9rWFBEG/rnG4qeH26lY1xkhf0m+m8mg1Ersoq4H6ufK9cRGAwP8FpYUKAn7oyHlieVWIhB5J aQUsRXfKsmIavIU4VnzZqp0j2O+FURRalEulaLccJccug== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches From: Nicolas Graves via Guix-patches via 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-Spam-Score: -2.79 X-Spam-Score: -2.79 X-Migadu-Queue-Id: 62CA858124 X-Migadu-Scanner: mx13.migadu.com X-TUID: JrI3QTIJAIEK * gnu/packages/web.scm (varnish): Improve style. [arguments]: Rewrite using gexps. [inputs]: Replace coreutils by coreutils-minimal, python by python-minimal. --- gnu/packages/web.scm | 106 ++++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 51 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index fe6b40067b..12e2c1de7b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6617,66 +6617,70 @@ (define-public varnish "0p2xf4a8bk2w8j9q20fazrc93fwcfhw8zcvdd8ssbahvlg2q78mb")))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") - (string-append "CC=" ,(cc-for-target)) - ;; Use absolute path of GCC so it's found at runtime. - (string-append "PTHREAD_CC=" - (search-input-file %build-inputs - "/bin/gcc")) - "--localstatedir=/var") - ,@(if (target-x86-32?) - '(#:make-flags - (list "CFLAGS+=-fexcess-precision=standard")) - '()) + (append + (if (target-x86-32?) + '(#:make-flags + (list "CFLAGS+=-fexcess-precision=standard")) + '()) + (list + #:configure-flags + #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") + (string-append "CC=" #$(cc-for-target)) + ;; Use absolute path of GCC so it's found at runtime. + (string-append "PTHREAD_CC=" + (search-input-file %build-inputs + "/bin/gcc")) + "--localstatedir=/var") #:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-absolute-file-names - (lambda _ - (substitute* '("bin/varnishtest/vtc_varnish.c" - "bin/varnishtest/vtc_process.c" - "bin/varnishtest/vtc_haproxy.c" - "bin/varnishtest/tests/u00014.vtc" - "bin/varnishd/mgt/mgt_vcc.c") - (("/bin/sh") (which "bash"))) - (let* ((rm (which "rm"))) - (substitute* "bin/varnishd/mgt/mgt_shmem.c" - (("rm -rf") (string-append rm " -rf"))) - (substitute* "bin/varnishtest/vtc_main.c" - (("/bin/rm") rm))) - (substitute* "bin/varnishtest/tests/u00000.vtc" - (("/bin/echo") (which "echo"))))) - (add-after 'unpack 'remove-failing-tests - (lambda _ - ;; This test seems to fail because of - ;; Failed: Servname not supported for ai_socktype - (delete-file "bin/varnishtest/tests/b00085.vtc"))) - (add-before 'install 'patch-Makefile - (lambda _ - (substitute* "Makefile" - ;; Do not create /var/varnish during install. - (("^install-data-am: install-data-local") "install-data-am: ")))) - (add-after 'install 'wrap-varnishd - ;; Varnish uses GCC to compile VCL, so wrap it with required GCC - ;; environment variables to avoid propagating them to profiles. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (varnishd (string-append out "/sbin/varnishd")) - (PATH (string-append (assoc-ref inputs "binutils") "/bin")) - (LIBRARY_PATH (string-append (assoc-ref inputs "libc") "/lib"))) - (wrap-program varnishd + #~(modify-phases %standard-phases + (add-after 'unpack 'use-absolute-file-names + (lambda _ + (substitute* '("bin/varnishtest/vtc_varnish.c" + "bin/varnishtest/vtc_process.c" + "bin/varnishtest/vtc_haproxy.c" + "bin/varnishtest/tests/u00014.vtc" + "bin/varnishd/mgt/mgt_vcc.c") + (("/bin/sh") (which "bash"))) + (let* ((rm (which "rm"))) + (substitute* "bin/varnishd/mgt/mgt_shmem.c" + (("rm -rf") (string-append rm " -rf"))) + (substitute* "bin/varnishtest/vtc_main.c" + (("/bin/rm") rm))) + (substitute* "bin/varnishtest/tests/u00000.vtc" + (("/bin/echo") (which "echo"))))) + (add-after 'unpack 'remove-failing-tests + (lambda _ + ;; This test seems to fail because of + ;; Failed: Servname not supported for ai_socktype + (delete-file "bin/varnishtest/tests/b00085.vtc"))) + (add-before 'install 'patch-Makefile + (lambda _ + (substitute* "Makefile" + ;; Do not create /var/varnish during install. + (("^install-data-am: install-data-local") + "install-data-am: ")))) + (add-after 'install 'wrap-varnishd + ;; Varnish uses GCC to compile VCL, so wrap it with required GCC + ;; environment variables to avoid propagating them to profiles. + (lambda* (#:key inputs #:allow-other-keys) + (wrap-program (string-append #$output "/sbin/varnishd") ;; Add binutils to PATH so gcc finds the 'as' executable. - `("PATH" ":" prefix (,PATH)) + `("PATH" ":" prefix (,(dirname (which "as")))) ;; Make sure 'crti.o' et.al is found. - `("LIBRARY_PATH" ":" prefix (,LIBRARY_PATH))))))))) + `("LIBRARY_PATH" ":" prefix + (,(dirname + (search-input-file inputs "lib/libc.so"))))))))))) (native-inputs - (list pkg-config python-sphinx python-docutils)) + (list pkg-config + python-sphinx + python-docutils)) (inputs (list bash-minimal - coreutils + coreutils-minimal jemalloc ncurses pcre2 - python + python-minimal readline)) (synopsis "Web application accelerator") (description -- 2.46.0