From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 qLP8Lt/PBGfG9QAA62LTzQ:P1 (envelope-from ) for ; Tue, 08 Oct 2024 06:23:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id qLP8Lt/PBGfG9QAA62LTzQ (envelope-from ) for ; Tue, 08 Oct 2024 08:23:27 +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=bJdIshFz; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=TlFpiean; 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=1728368607; a=rsa-sha256; cv=none; b=nuI1NTtlC+KTc6fBuiG2SiT8W3nFvrqt168vfJZqt9ZRhQZW3G1aXQpCvx6pfnHjQ4Sy3V 2lyJz6tri6EBVt2aXX/3mbYsDVmkX3vRGCGJeZ+pZCIJw+Ow5EClPcBGKc3DPGS75mhPjM NU68B5zE8Iuz/jcsIUjFf80sx9t3dSQY/LRjbfvFz4yV2r/hEIW64OPWCNYC96AqjbcD/w sets9cVB7kWPWurp/8Xrfike7rLMGV/yKYQctoRbMV/CvbUhuZ4sLxn9l+uozxYVoYOq+A f2f6dYjyOepiORgc+CHIX+vSxduO+b0k9Zztp6rr0WfQ3O3yfG85q6zTCJHuYA== 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=bJdIshFz; dkim=fail ("headers rsa verify failed") header.d=ngraves.fr header.s=ovhmo4487190-selector1 header.b=TlFpiean; 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=1728368607; 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=D+PhA+631rgUNDNFEexPO0Nyg24k7e7TAlpANxpgfs0=; b=ACz7dlYCvnd8lHzrgG03UI5H7Fh0BM6/CLPVd0Uyigl4awuJyUyKJdAr2flUjBCUH64XnA WWUNKXFGWzarEiq/0BGnLO/sN++cPBbOcmRwn2Zuna0NsVCczokokzPQtzJ/rfe3jMEkcb fK8v1egrCsZJ+Pl+2b+lxGoQTUpSTV8LIKqLWedN6AgvDD0IxQeuwtSMSBNSK3nep89rmK 7JECxDsqYpsKZOl9w7h5TOJHz+AlDIknNGK9gALNhTcwE0gLvNmlBXAQrVV/bnQjfTyv0l AhH7NuilwHK6QWsX9foXdDyj+9Ipg9iG3NZqe2SuiI44EARzdmxWXbjd6PXHxA== 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 49ED073D97 for ; Tue, 08 Oct 2024 08:23:27 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sy3cZ-0001VP-GD; Tue, 08 Oct 2024 02:22:59 -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 1sy3cV-0001UQ-9g for guix-patches@gnu.org; Tue, 08 Oct 2024 02:22:55 -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 1sy3cV-00031o-0V for guix-patches@gnu.org; Tue, 08 Oct 2024 02:22:55 -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=D+PhA+631rgUNDNFEexPO0Nyg24k7e7TAlpANxpgfs0=; b=bJdIshFz/3AbfIyKrNZF0if+z1q5YhHj5OXVPGQx8JKxOIXUjfoHpy1N4NqBk32eLLvadaaH7s8A5yPWZm/nDSu4krSjGaq8lzT27bY1dTdGwj2KQGy/10c3LKdAj3Sbc0mcxyvsV7vJLBR5OLFXC95fBIckii4kT2jlX9ZXCDgpQLhoFlJZbHt/hkqrNrQNlIhIdvMAi0MbjWPV+j3ZWb9w08duoxOJ7KXT1yhpplg4PIqKaxe39LnKoR8/Q4knGarrAD/BQ26OGxAt/UmbaFo33FTidfPi5RpDDNepgV1JHkIfNPjZHPRKbq2uN1VOhtJ76gI+njMLQJ2lHK+/YA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sy3cd-0000t3-6D for guix-patches@gnu.org; Tue, 08 Oct 2024 02:23:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73682] [PATCH 3/3] gnu: varnish: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Oct 2024 06:23: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.17283685323306 (code B ref 73682); Tue, 08 Oct 2024 06:23:03 +0000 Received: (at 73682) by debbugs.gnu.org; 8 Oct 2024 06:22:12 +0000 Received: from localhost ([127.0.0.1]:50383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sy3bj-0000rB-LI for submit@debbugs.gnu.org; Tue, 08 Oct 2024 02:22:12 -0400 Received: from 14.mo584.mail-out.ovh.net ([46.105.40.29]:57819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sy3be-0000qT-0w for 73682@debbugs.gnu.org; Tue, 08 Oct 2024 02:22:06 -0400 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.17.245]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4XN5X02kpLz197Z for <73682@debbugs.gnu.org>; Tue, 8 Oct 2024 06:21:52 +0000 (UTC) Received: from ghost-submission-55b549bf7b-65s68 (unknown [10.110.96.132]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B1A431FD24; Tue, 8 Oct 2024 06:21:51 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-55b549bf7b-65s68 with ESMTPSA id KwnXHn/PBGe+OgAAObLSPQ (envelope-from ); Tue, 08 Oct 2024 06:21:51 +0000 X-OVh-ClientIp: 86.246.19.221 Date: Tue, 8 Oct 2024 08:21:41 +0200 Message-ID: <20241008062144.22558-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241008062144.22558-2-ngraves@ngraves.fr> References: <20241008062144.22558-2-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 14951950766882415330 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdeftddguddtkecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeefieekvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=D+PhA+631rgUNDNFEexPO0Nyg24k7e7TAlpANxpgfs0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1728368512; v=1; b=TlFpiean8zsF5vngF2+3GaF9VEnROMKCt4zmRlFcNkv2totqFDhnypL/f7pHjt7+DD6q/UnO stR44HGDibvogEQMqFihZCBxhg95UTxhkPPJ4EXxQaIR6nhtnK5q4RuePoQaDf9ORpfk21OmkBA PLR4khpUJ0vCx53scTOTt6InT7N9HG7uZTwWc4e+rkZ80/cgMs16EHAJa7QaFpqg0FZBYrxEZbq 2dP+JImeiSpxbabUTxK25mmIcoxUGM14ajsRTj7l0QmVF2mXTCMUD4VwEkmdtZ/jCj3BF6MGWfS dOu/h1xYKq6IplsDxumEAX+sKGrDnU9oIThDndXqB80Fw== 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.20 X-Spam-Score: -3.20 X-Migadu-Queue-Id: 49ED073D97 X-Migadu-Scanner: mx10.migadu.com X-TUID: eAuSbH8cXOT6 * gnu/packages/web.scm (varnish): Improve style. [arguments]: Rewrite using gexps. [inputs]: Replace coreutils by coreutils-minimal, python by python-minimal. Add glibc. --- 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 dec0e8e2c6..75bad3a579 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 _ + (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 + (,#$(file-append (this-package-input "glibc") "/lib")))))))))) (native-inputs - (list pkg-config python-sphinx python-docutils)) + (list pkg-config + python-sphinx + python-docutils)) (inputs (list bash-minimal - coreutils + coreutils-minimal + glibc jemalloc ncurses pcre2 - python + python-minimal readline)) (synopsis "Web application accelerator") (description -- 2.46.0