From patchwork Fri Aug 18 18:12:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52987 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 C639527BBF0; Fri, 18 Aug 2023 19:18:34 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 DCEAB27BBEC for ; Fri, 18 Aug 2023 19:18:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX42w-0006kd-Kb; Fri, 18 Aug 2023 14:18:06 -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 1qX42u-0006j7-8u for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:04 -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 1qX42u-0000Ka-0n for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qX42u-0003FQ-H3 for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65371] [PATCH telephony-team 07/10] gnu: libnatpmp: Use gexps and simplify. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 18:18:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65371@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 65371-submit@debbugs.gnu.org id=B65371.169238264712369 (code B ref 65371); Fri, 18 Aug 2023 18:18:04 +0000 Received: (at 65371) by debbugs.gnu.org; 18 Aug 2023 18:17:27 +0000 Received: from localhost ([127.0.0.1]:48728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42I-0003DQ-Kh for submit@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:27 -0400 Received: from mail-qt1-x82c.google.com ([2607:f8b0:4864:20::82c]:59468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42B-0003CO-NE for 65371@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:20 -0400 Received: by mail-qt1-x82c.google.com with SMTP id d75a77b69052e-40ffb4476d8so7460741cf.2 for <65371@debbugs.gnu.org>; Fri, 18 Aug 2023 11:17:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692382633; x=1692987433; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SqdqIowMOwC6pyiYpp0NmYkeml3RDZM0iW+oYVIjYDc=; b=ZwzhQ/hkjlX1wx6T+qLTSXAkFdNSFTxML8REJULHWFdeALIiU/Nt94ia96nenKKUF9 KaHsvqOHF8EXnCD2VKhsM+yXkkkUxtbNq8Tn28i2NFKU5aiPcS0EyRIpu9wGNPQpTJb/ FZIJ7QRSYKViD62CatdXBiPqPbGhzq7B6l6GRalAq+KS0wmSxina1j53wQkNRm0/SEox /HgS/OcdVUd+pPUEEeNyI2Cml+NF2ozAsaabbfX1qdjccWNwUrHEZduWg8W7xVwSWuQl vTtCgC67DzBbFNx4lP57BA+EYMjgFxBcGL2bNXAn7uYBbyeQ0lt4lZgImdUTIE+TEn4T mGWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692382633; x=1692987433; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SqdqIowMOwC6pyiYpp0NmYkeml3RDZM0iW+oYVIjYDc=; b=H6mkBojNcn+pg/zZJDdpOsgabAw1udCusWDInmGtzLdcvjeCHyb9A3q3oKhchO3oqw CLQshnGKMevGdqDmGv27NAUjuzsx9CnjEtZ8UCDD4iDL6B5H3hPhZJjI3Urqat0m5z2/ Z37mGmaTmC7z0NUHsb0cTBW0CpzfakKDr7eooW/sqxKuwuWPrcjS9QG9fYxvYLLQM9Uy GShQb2ucpzB7GUyWnyMsUHZxrTMJBSwtsFb/HxiigkuleX83Pm1V33M8XnLHy0Lgwxpq Y5uRo4xdmdfaASYIKNqAiOmstLROeEhZ1x/8gi8U2TrvXN3y6PLVNh+jQ31Uobc0DS6K YrYA== X-Gm-Message-State: AOJu0YxT3fdh5W3H7rfVYrTciLJvIc3XXYIBEree6xOPJdBxmGDgQxgd lAu6HFeLM/AAXomVaqdiUIuGWV7kqlO/Ng== X-Google-Smtp-Source: AGHT+IE7vKWTNn/3l559ndO7/VDvCI/udP+Q9Xi67sEdeptAPGIACmziQmXHS0uaXf7mCDNNtB/7OA== X-Received: by 2002:a05:622a:2d1:b0:405:5a1b:2767 with SMTP id a17-20020a05622a02d100b004055a1b2767mr3989588qtx.6.1692382633547; Fri, 18 Aug 2023 11:17:13 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-239.b2b2c.ca. [205.233.124.239]) by smtp.gmail.com with ESMTPSA id z5-20020ac84305000000b00403e80cad67sm687678qtm.41.2023.08.18.11.17.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 11:17:13 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 18 Aug 2023 14:12:58 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/networking.scm (libnatpmp) [arguments]: Use gexps. Use gexp variables and cc-for-target in make flags. --- gnu/packages/networking.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index a7cb4f876e..1b2e26c3f6 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1435,19 +1435,13 @@ (define-public libnatpmp "0w7wvf4yi8qv659dg9d3ndqvh3bqhgm21gd135spwhq6hhnfv106")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'check)) ; no tests - #:make-flags - (let* ((target ,(%current-target-system)) - (gcc (if target - (string-append target "-gcc") - "gcc"))) - (list - (string-append "CC=" gcc) - (string-append "INSTALLPREFIX=" (assoc-ref %outputs "out")) - (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))))) + (list #:phases #~(modify-phases %standard-phases + (delete 'configure) + (delete 'check)) ; no tests + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "INSTALLPREFIX=" #$output) + (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib")))) (home-page "http://miniupnp.free.fr/libnatpmp.html") (synopsis "C library implementing NAT-PMP") (description