From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iD97DQmTEGdVPwEAqHPOHw:P1 (envelope-from ) for ; Thu, 17 Oct 2024 04:31:05 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id iD97DQmTEGdVPwEAqHPOHw (envelope-from ) for ; Thu, 17 Oct 2024 06:31:05 +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=q42UvZcA; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=NQ4sqTz2; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1729139464; a=rsa-sha256; cv=none; b=cYr++zFhNfBTcCCMtzwfABoso1qYAB24PGwl57Dr6ixF8LkrAe2n2vZ8yqPfrYhSmiLkbI mwA76I6/NvPXf5/8FG7ULuxKTO6j8l+g54qLl7Gu03h+C7ZEFXzOnUBMZDAU0TTf4QWVij f5JvdvZ9qWE0utWbrfi/lwRQspY7ORw0BNwFtDNMl3AxtgC0FlIGz8Yrxamrrw+jcVtf32 dP1aQQ88SkXC+3EmHiWXKGuZGgsrDGmzsytfhoZynGLhBI80fambfEn+rFPGPa10mwRsXt cQtPK2KXqT6lXYtkzWcdUVbohMWJEANRnN0jHKNhTwnBWgfdlhMWmrX1nPlwwg== 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=q42UvZcA; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=NQ4sqTz2; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1729139464; 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=IXw61wLlbc4vcCKzXYbrLfxAnlyGOyryMJHwuEY5qTU=; b=NP+gkeUR6pzAFLCDDOQ1dPSkF8Uaq5aidh/zLRO33HwaFAQzJydx1JhoVjEP/rBu6YyBBD x88BVesacimYrL0SQVTnT8hYUgQBKrzK+hfMTdU3QpMfCuPCL3vKqksHUiVctS4ekaPdMs W8bwhsjaFBv/uL1YBsPwP/6fgzMrfHFJj74j3Fq4R96TbjVk0MzTMbAQZFm2zuVQE23Mri cKxmIXRZBiPe950PTyXIH7rI2DJOu0z6y4rmoLnZvtGSnq+R1+k8KSFcBgedSsHWK95MeB id6oX8KzxOIl6lOnAJFQfBZy5eIx+MfQWxqM9GmBS7MAb7+LVlpysvT39cFZyA== 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 AFF53795FF for ; Thu, 17 Oct 2024 06:31:04 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1IAA-0000YV-6c; Thu, 17 Oct 2024 00:31:02 -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 1t1I9r-0000QP-Gp for guix-patches@gnu.org; Thu, 17 Oct 2024 00:30:43 -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 1t1I9r-0004be-7T for guix-patches@gnu.org; Thu, 17 Oct 2024 00:30: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=IXw61wLlbc4vcCKzXYbrLfxAnlyGOyryMJHwuEY5qTU=; b=q42UvZcAEJH0t2luZyGa/Mf3VbyarHL95y5eRR6Bhk8qPlK6IiENW5OMUM2K/PPkIjIbki2bR96loCxRbbDa5Bbw9UNoUReU4lQVYhuB8pFfSy68RvCrfd70NyfpkugMxohmhRNQh1GT9rbIfRGmkRjX9zzLyHSV0FhF3ADFrZ+25yxMIinPxewqfFVAG3g+Fv1hXcWvKAFoGjGRHNPxn2NKJiolU3xiku+LBLAyYkaNeNzZG5QsDFo8Oo2WHMlMejibJ7eDcLJAUOTzOuqbqLrlJW2PPxnlOjZzLDj14ycuKxOHJEZ0bEi5r5uO8sHYizDj0Vs4Rl51dKNUBtrrIA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t1IAB-0000OV-KN for guix-patches@gnu.org; Thu, 17 Oct 2024 00:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH v4 4/4] gnu: varnish: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Oct 2024 04:31:03 +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.17291394501471 (code B ref 73682); Thu, 17 Oct 2024 04:31:03 +0000 Received: (at 73682) by debbugs.gnu.org; 17 Oct 2024 04:30:50 +0000 Received: from localhost ([127.0.0.1]:32972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1I9u-0000Nb-JY for submit@debbugs.gnu.org; Thu, 17 Oct 2024 00:30:50 -0400 Received: from 10.mo576.mail-out.ovh.net ([46.105.73.241]:55497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t1I9j-0000I5-6B for 73682@debbugs.gnu.org; Thu, 17 Oct 2024 00:30:41 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.140.75]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4XTZd05WV4z1hT9 for <73682@debbugs.gnu.org>; Thu, 17 Oct 2024 04:30:12 +0000 (UTC) Received: from ghost-submission-55b549bf7b-jm7lf (unknown [10.110.118.109]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 4D1321FDAE; Thu, 17 Oct 2024 04:30:12 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-55b549bf7b-jm7lf with ESMTPSA id GX92BNSSEGfeOwwAIE+McA (envelope-from ); Thu, 17 Oct 2024 04:30:12 +0000 X-OVh-ClientIp: 90.110.172.34 Date: Thu, 17 Oct 2024 06:30:00 +0200 Message-ID: <20241017043006.4836-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241017043006.4836-1-ngraves@ngraves.fr> References: <20241017043006.4836-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 10580081427724690146 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdehtddgkeefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddruddutddrudejvddrfeegpdefjedrheelrddugedvrddutdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejfeeikedvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeeipdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=IXw61wLlbc4vcCKzXYbrLfxAnlyGOyryMJHwuEY5qTU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729139412; v=1; b=NQ4sqTz2M46jtTuNYaEcPlQt8cINgnDRsBiRlqtYVmdjS3RmgqfMl/nVMD45uBxQI3XP5NcO eYdm7vkDaEl+c1pEwr8QgVPzO114D5rc/saNybgZasQFAo6zpye+8eYUEYVCVPFmBxZA9+SQ392 AV6Go+re+ZmZFTLXANhNzDF5b+0mYmMO+A/KXpBPrbSRKat2plHE11R4Qo19BIhkfI9vk2esJHH uzqPz5KbqUaWqUhNRIsUdSx4VV2YBJ1Rjx7Y0Nx2JadSwT9Q9Q3y7CPR4WBjJQZufpXHDy7P0dC f/DxA9qLZ6laBNRuHlpg2tDUokMfmkbN5zPBosekAvFaw== 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.10 X-Spam-Score: -3.10 X-Migadu-Queue-Id: AFF53795FF X-Migadu-Scanner: mx10.migadu.com X-TUID: YIa4psQWidQx * 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 19a451f55d..e2702d7e98 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