From patchwork Tue Jun 28 18:08:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 40383 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 7650F27BBEB; Tue, 28 Jun 2022 19:09:37 +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_INVALID, DKIM_SIGNED,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 E21BC27BBE9 for ; Tue, 28 Jun 2022 19:09:36 +0100 (BST) Received: from localhost ([::1]:39640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6FeZ-0003Dj-1C for patchwork@mira.cbaines.net; Tue, 28 Jun 2022 14:09:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6Fe2-0003Bp-Lm for guix-patches@gnu.org; Tue, 28 Jun 2022 14:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34165) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o6Fe2-0006wf-9z for guix-patches@gnu.org; Tue, 28 Jun 2022 14:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o6Fe2-0007m3-4G for guix-patches@gnu.org; Tue, 28 Jun 2022 14:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56286] [PATCH 3/3] gnu: Add pkgconf. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Jun 2022 18:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56286 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56286@debbugs.gnu.org Cc: "\(" Received: via spool by 56286-submit@debbugs.gnu.org id=B56286.165643972429832 (code B ref 56286); Tue, 28 Jun 2022 18:09:02 +0000 Received: (at 56286) by debbugs.gnu.org; 28 Jun 2022 18:08:44 +0000 Received: from localhost ([127.0.0.1]:56291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6Fdk-0007l1-97 for submit@debbugs.gnu.org; Tue, 28 Jun 2022 14:08:44 -0400 Received: from knopi.disroot.org ([178.21.23.139]:47552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o6Fdi-0007ks-MI for 56286@debbugs.gnu.org; Tue, 28 Jun 2022 14:08:43 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2BFCE45B27; Tue, 28 Jun 2022 20:08:42 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id csoQJW-bjvJN; Tue, 28 Jun 2022 20:08:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1656439718; bh=87ZwdpeZF8HwybfS84U2t8b+gRbRztQcbMcaWvMm/LM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ESCgtifd+JTec6XRCa02ZkzTt0VAQJnA/U+/kiJmovu0pcu/ItzKqwbcJzZ9ogJF+ gl87LNxWFiGPjBdghvz3jWlZgiOLyFwPe+TEusd6LSB7FJv/RqerizWS9o77bpF2gI mK9BTyFZjoH8oB0czxw2VnV8p4e5wJlu/WdhJcPDpJ4/vyR6m79HlXl10YT7uQ71Pe 6og6KenXY+mlINstSUtXus7Yn+40KsuJg98SGAPfAa+3xrrzPAdkTsoXP3KNeKphxV WlSMmWbHyWr8q0EDxaak8rMHppNiCl2+8xVdUbvIkby2AyD9eJRbpYp23EtDjMbCog /oxqaRvacLr6g== Date: Tue, 28 Jun 2022 19:08:31 +0100 Message-Id: <20220628180831.9792-3-paren@disroot.org> In-Reply-To: <20220628180831.9792-1-paren@disroot.org> References: <20220628180831.9792-1-paren@disroot.org> 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" Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" X-getmail-retrieved-from-mailbox: Patches Note that this package produces a `guix lint` warning that is basically unfixable: ``` /home/paren/code/guix/gnu/packages/pkg-config.scm:213:16: pkgconf@1.8.0-0.b0802cb: TLS certificate error: X.509 server certificate for 'pkgconf.org' does not match: C=US,ST=California,L=San Francisco,O=GitHub\, Inc.,CN=*.github.com ``` This is because pkgconf.org is actually hosted via Github Pages. * gnu/packages/pkg-config.scm (pkgconf): New variable. --- gnu/packages/pkg-config.scm | 48 +++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index dcd6ba3353..8c826ca25d 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -24,9 +24,11 @@ (define-module (gnu packages pkg-config) #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module (guix gexp) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix memoization) #:use-module (guix packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:export (pkg-config)) @@ -168,3 +170,49 @@ (define where (string-append #$output "/bin/pkg-config")) (inherit original) (variable "PKG_CONFIG_PATH_FOR_BUILD"))) (package-native-search-paths %pkg-config))))) + +(define-public pkgconf + ;; The last release was tagged on 2021-07-25, and there's been a lot of activity + ;; since then. + (let ((commit "b0802cb3d19b5b963ad20eed464a2da6e7d7b0b5") + (revision "0")) + (package + (name "pkgconf") + (version (git-version "1.8.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pkgconf/pkgconf") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xcpvzahrp34jhdfsazdhbj9byr2wqwmjx7jfarhpc1x4z3l37a0")))) + (build-system gnu-build-system) + (arguments + ;; Kyua, which pkgconf uses for testing, is not packaged in Guix, + ;; though it should be trivial to add; the problem is that it "cannot + ;; find test programs" that it needs when run during this package's + ;; check phase. + ;; + ;; The silver lining is that omitting Kyua means we drop dependencies + ;; on pkg-config, Lua, and C++. It does not, in fact, seem as if the + ;; tests are even supposed to be run by anyone but the pkgconf + ;; developers, as touts pkgconf's dependency-free + ;; nature as an advantage over pkg-config. + (list #:tests? #f)) + (native-inputs (list ;; pkgconf's autotools setup forbids the use of any + ;; earlier version of autoconf than 2.71. + autoconf-2.71 + automake + libtool)) + (native-search-paths + (list (search-path-specification + (variable "PKG_CONFIG_PATH") + (files '("lib/pkgconfig" "lib64/pkgconfig" "share/pkgconfig"))))) + (home-page "https://pkgconf.org") + (synopsis "Package compiler and linker metadata toolkit") + (description "@code{pkgconf} is a compiler and linker configuration toolkit, +mostly compatible with freedesktop.org's @code{pkg-config}. A library called +@code{libpkgconf} is provided so that programs can embed its functionality.") + (license license:isc))))