Subject: [core-updates PATCH 08/20] gnu: pkg-config: Alias to pkgconf-as-pkg-config.

From: Maxim Cournoyer <[email-masked]>
Date: Thu, 22 Feb 2024 11:10:07 -0500

This switches the default pkg-config implementation used in Guix to pkgconf.

* gnu/packages/pkg-config.scm (pkg-config): Define as pkgconf-as-pkg-config.
(%pkgconf-with-tests): Renamed from %pkgconf.
(%pkgconf): New minimal variant to avoid circular dependencies for bootstrap
sensitive packages.
(%pkgconf-as-pkg-config): Delete now inherited hidden property.
* gnu/packages/commencement.scm (make-gnu-make-final): Replace %pkg-config
with %pkgconf-as-pkg-config.

Change-Id: Id2b9f40f8f09babae9c6dfc47d1de071ce78e011
---

 gnu/packages/commencement.scm | 13 ++++++-------
 gnu/packages/pkg-config.scm   | 25 +++++++++++++++++++++----
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 3e5e21ca03..e9474a797e 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3346,13 +3346,13 @@ (define with-boot5 with-boot4)
 
 (define (make-gnu-make-final)
   "Compute the final GNU Make, which uses the final Guile."
+  ;; Avoid a circular dependency by creating a new bootstrap pkg-config
+  ;; variant.
   (let ((pkg-config (package
-                      (inherit %pkg-config)       ;the native pkg-config
-                      (inputs `(("guile" ,guile-final)
-                                ,@(%boot5-inputs)))
-                      (arguments
-                       `(#:implicit-inputs? #f
-                         ,@(package-arguments %pkg-config))))))
+                      ;; Refer to %pkgconf-as-pkg-config instead of
+                      ;; pkgconf-as-pkg-config to ensure native package is
+                      ;; used.
+                      (inherit (with-boot5 %pkgconf-as-pkg-config)))))
     (package
       (inherit (package-with-bootstrap-guile gnu-make))
       (inputs `(("guile" ,guile-final)
@@ -3362,7 +3362,6 @@ (define (make-gnu-make-final)
        `(#:implicit-inputs? #f
          ,@(package-arguments gnu-make))))))
 
-
 (define coreutils-final
   ;; The final Coreutils.  Treat them specially because some packages, such as
   ;; Findutils, keep a reference to the Coreutils they were built with.
diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm
index e8d63be3d7..934449aad2 100644
--- a/gnu/packages/pkg-config.scm
+++ b/gnu/packages/pkg-config.scm
@@ -31,7 +31,9 @@ (define-module (gnu packages pkg-config)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
   #:use-module (guix memoization)
-  #:export (pkg-config
+  #:use-module (srfi srfi-1)
+  #:export (old-pkg-config              ;the original
+            pkg-config                  ;alias for pkgconf-as-pkg-config
             pkgconf
             pkgconf-as-pkg-config))
 
@@ -89,7 +91,9 @@ (define-public %pkg-config
 it can be used for defining the location of documentation tools, for
 instance.")))
 
-(define-public %pkgconf
+;;; This is the package exposed to the CLI, to ease updates via 'guix
+;;; refresh'.
+(define-public %pkgconf-with-tests
   (package
     (name "pkgconf")
     (version "2.1.0")
@@ -119,6 +123,13 @@ (define-public %pkgconf
 pkgconf.")
     (license isc)))
 
+;;; This is the minimal, untested variant used to avoid circular dependencies.
+(define-public %pkgconf
+  (hidden-package
+   (package/inherit %pkgconf-with-tests
+     (arguments (list #:tests? #f))
+     (native-inputs '()))))
+
 (define-public %pkgconf-as-pkg-config
   (package/inherit %pkgconf
     (name "pkgconf-as-pkg-config")
@@ -145,7 +156,8 @@ (define-public %pkgconf-as-pkg-config
                          (string-append #$output "/share/aclocal"))))))))
     (native-inputs '())
     (inputs (list %pkgconf))
-    (propagated-inputs '())))
+    (propagated-inputs '())
+    (properties (alist-delete 'hidden? (package-properties %pkgconf)))))
 
 
 ;;;
@@ -220,7 +232,7 @@ (define pkgconf-as-pkg-config-for-target
 ;; These are a hacks for automatically choosing the native or the cross
 ;; `pkg-config' depending on whether it's being used in a cross-build
 ;; environment or not.
-(define-syntax pkg-config
+(define-syntax old-pkg-config
   (identifier-syntax (pkg-config-for-target (%current-target-system))))
 
 (define-syntax pkgconf
@@ -230,6 +242,11 @@ (define-syntax pkgconf-as-pkg-config
   (identifier-syntax (pkgconf-as-pkg-config-for-target
                       (%current-target-system))))
 
+;;; This alias is to ensure we use pkgconf instead of pkg-config across Guix,
+;;; which includes welcome refinements such as proper handling of the
+;;; Requires.private field.
+(define pkg-config pkgconf-as-pkg-config)
+
 
 ;;;
 ;;; pkg-config packages for native use (build-time only).
-- 
2.41.0