From patchwork Thu Feb 22 16:10:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 60884 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 0A97D27BBEC; Thu, 22 Feb 2024 16:17:05 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 E6AA027BBE9 for ; Thu, 22 Feb 2024 16:17:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdBkh-0003Un-5Y; Thu, 22 Feb 2024 11:16:51 -0500 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 1rdBkY-0003Mm-Cr for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:43 -0500 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 1rdBkY-0004aE-25 for guix-patches@gnu.org; Thu, 22 Feb 2024 11:16:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdBku-0003Tz-UF for guix-patches@gnu.org; Thu, 22 Feb 2024 11:17:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68813] [core-updates PATCH 05/20] gnu: Add pkgconf-as-pkg-config. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Feb 2024 16:17:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68813 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68813@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68813-submit@debbugs.gnu.org id=B68813.170861857213056 (code B ref 68813); Thu, 22 Feb 2024 16:17:04 +0000 Received: (at 68813) by debbugs.gnu.org; 22 Feb 2024 16:16:12 +0000 Received: from localhost ([127.0.0.1]:38569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBk3-0003OQ-Sr for submit@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:12 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:42085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdBk1-0003Na-6J for 68813@debbugs.gnu.org; Thu, 22 Feb 2024 11:16:09 -0500 Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-68facd7ea4aso9373226d6.0 for <68813@debbugs.gnu.org>; Thu, 22 Feb 2024 08:15:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708618480; x=1709223280; darn=debbugs.gnu.org; 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=A41ItVnEtdHtAJoClJhGBadNihX2da0ujz7wkwwkb0U=; b=RV4uu6/zVh7NWMXpCUsoYNNf5deqHkzr3eVfG9Y+ko8FSBwflnum8/fSIjKThdXXkm HVKmtotSBy9ZeJktnQzD3fqADMEI7pjHxspelrg+dGornaaa52RV2X+lVLAFWDAnQ4Xo HkUEOwshapOTtJ6jKFuQ/EZHkkLUgeKBYPHWIygCoKwgJP369Sy8YQ2hGIRKXjWKODJE fBdcvczUQe3CEt4Xy7psHp9B8QCMBIs2uO4YEW7lMvJT0bSRlDW+sDN2nwXaU9KgUAkE By552x8ZrcpK1mYwD4b8yRdTmX7etBr5f9LW5xLeZBd/EaQHAwVJPj5lQDBI1YO/6A45 JOnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708618480; x=1709223280; 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=A41ItVnEtdHtAJoClJhGBadNihX2da0ujz7wkwwkb0U=; b=Urs5MjFwiwzRVx06+Yw1uMIGEi+ud+uQijZ8rTtsAiUiSu4nvXKGpr5VN7b6+WLHte G8+KAvav5smXO4hPwGhJbyLb/hWUeg46LpCtIHiONBAZ9RBBzx5NfXvrsBXGfUfTDpWm lBi9x/pGExty9B98DFkkUKlmiNmRhczDbcikodIF2ts4cA6Q6eAYHElMr3c6Ng1OSxqx bAoXLsUkhkciYBRyvcEq+SglAGGvfyEYYKoeqg8Y81L8NaCjX9UxTghOBT23Y2mRbEGu so2mvcxmsRcSZwidOYw7/RPDkCs/598MR1GwXeLduCn1GHO2PoMLGMKGFm/xrdfNiDtu TXyg== X-Gm-Message-State: AOJu0Yz7NKlRNESlcv01H2zwrVI22Mn94Fg5sbyUadku7k9zGuA+dFbF zXkrGHiDdJ58ZarC/TzmC2qpq+WHcUSok6ykmMNR0h9UbrmjfY9p1FWC9/U5 X-Google-Smtp-Source: AGHT+IE/cO9iO4IZw0n1E5e0AN9jDpUfUyK8iwP19YgOBPDhEDOA1Ura1z1zPTdGq8BuBoJaAV7UHw== X-Received: by 2002:a0c:de0f:0:b0:68f:8c73:6ffd with SMTP id t15-20020a0cde0f000000b0068f8c736ffdmr4526310qvk.10.1708618480458; Thu, 22 Feb 2024 08:14:40 -0800 (PST) Received: from localhost.localdomain (dsl-155-144.b2b2c.ca. [66.158.155.144]) by smtp.gmail.com with ESMTPSA id od5-20020a0562142f0500b0068fa74cfa79sm2078437qvb.117.2024.02.22.08.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 08:14:40 -0800 (PST) From: Maxim Cournoyer Date: Thu, 22 Feb 2024 11:10:04 -0500 Message-ID: <5b85c4d9c68640a6db2d39865dbe9d0dffa4238f.1708618218.git.maxim.cournoyer@gmail.com> 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/pkg-config.scm (pkgconf-as-pkg-config): New variable. Change-Id: Ica85d2c248817fdf4756680cd94b0380e4a2b01f --- gnu/packages/pkg-config.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index 2f07bdab9d..a5459dd2a8 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -198,3 +198,31 @@ (define-public pkgconf such as compilers and IDEs to discover and use libraries configured by pkgconf.") (license isc))) + +(define-public pkgconf-as-pkg-config + (package/inherit pkgconf + (name "pkgconf-as-pkg-config") + (build-system gnu-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key inputs #:allow-other-keys) + (let ((pkgconf (search-input-file inputs "bin/pkgconf"))) + (mkdir-p (string-append #$output "/bin")) + (symlink pkgconf (string-append #$output "/bin/pkg-config")) + + ;; Also make 'pkg.m4' available, some packages might expect it. + (mkdir-p (string-append #$output "/share")) + ;; XXX: Using '#$(this-package-input "pkgconf") here would + ;; create a cycle. + (symlink (string-append (dirname (dirname pkgconf)) + "/share/aclocal") + (string-append #$output "/share/aclocal")))))))) + (native-inputs '()) + (inputs (list pkgconf)) + (propagated-inputs '())))