[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
78/182: gnu: commencement: Ensure 'gnu-make-final' refers to the native
From: |
guix-commits |
Subject: |
78/182: gnu: commencement: Ensure 'gnu-make-final' refers to the native 'pkg-config'. |
Date: |
Fri, 15 Nov 2019 00:01:41 -0500 (EST) |
kkebreau pushed a commit to branch wip-gnome-updates
in repository guix.
commit 1407f46d5370e541db2d58bb93590bee1f7d7c12
Author: Ludovic Courtès <address@hidden>
Date: Thu Nov 7 10:22:24 2019 +0100
gnu: commencement: Ensure 'gnu-make-final' refers to the native
'pkg-config'.
Fixes <https://bugs.gnu.org/38093>.
When running:
guix build --target=arm-linux-gnueabihf -e '(@ (gnu packages base)
coreutils)'
the '%current-target-system' parameter is set by the time the top-level
of (gnu packages commencement) is evaluated. Consequently, we need to
ensure that the 'pkg-config' macro evaluates in a context where
'%current-target-system' is unset.
* gnu/packages/commencement.scm (gnu-make-final): Refer to '%pkg-config'
instead of 'pkg-config'.
* tests/guix-build.sh: Add test.
---
gnu/packages/commencement.scm | 2 +-
tests/guix-build.sh | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index b022a0d..6a382c7 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2402,7 +2402,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"$@\"~%"
;; PKG-CONFIG.
;; TODO: Fix that on the next rebuild cycle.
(let ((pkg-config (package
- (inherit pkg-config)
+ (inherit %pkg-config) ;the native pkg-config
(inputs `(("guile" ,guile-final)
,@(%boot5-inputs)))
(arguments
diff --git a/tests/guix-build.sh b/tests/guix-build.sh
index 37666ff..52feda9 100644
--- a/tests/guix-build.sh
+++ b/tests/guix-build.sh
@@ -226,6 +226,10 @@ rmdir "$result"
# Cross building.
guix build coreutils --target=mips64el-linux-gnu --dry-run --no-substitutes
+# Likewise, but with '-e' (see <https://bugs.gnu.org/38093>).
+guix build --target=arm-linux-gnueabihf --dry-run \
+ -e '(@ (gnu packages base) coreutils)'
+
# Replacements.
drv1=`guix build guix --with-input=guile@2.0=guile@2.2 -d`
drv2=`guix build guix -d`
- 61/182: gnu: python-pyatspi: Update to 2.34.0., (continued)
- 61/182: gnu: python-pyatspi: Update to 2.34.0., guix-commits, 2019/11/15
- 65/182: gnu: linux-libre@4.9: Update to 4.9.199., guix-commits, 2019/11/15
- 68/182: gnu: linux-libre: Update to 5.3.9., guix-commits, 2019/11/15
- 64/182: gnu: linux-libre@4.4: Update to 4.4.199., guix-commits, 2019/11/15
- 67/182: gnu: linux-libre@4.19: Update to 4.19.82., guix-commits, 2019/11/15
- 66/182: gnu: linux-libre@4.14: Update to 4.14.152., guix-commits, 2019/11/15
- 72/182: gnu: eolie: Don't create icon cache., guix-commits, 2019/11/15
- 71/182: gnu: eog: Don't create icon cache., guix-commits, 2019/11/15
- 76/182: gnu: git-annex: Update to 7.20191106., guix-commits, 2019/11/15
- 75/182: gnu: john-the-ripper-jumbo: Enable tests., guix-commits, 2019/11/15
- 78/182: gnu: commencement: Ensure 'gnu-make-final' refers to the native 'pkg-config'.,
guix-commits <=
- 77/182: derivations: Use a regular hash table for the module cache., guix-commits, 2019/11/15
- 80/182: graph: Support package transformation options., guix-commits, 2019/11/15
- 74/182: gnu: john-the-ripper-jumbo: Update to 1.9.0., guix-commits, 2019/11/15
- 81/182: news: Add entry for package transformation options in "guix graph"., guix-commits, 2019/11/15
- 86/182: gnu: libdvdnav: Don't use NAME in source URI., guix-commits, 2019/11/15
- 89/182: gnu: python-dbus: Update to 1.2.10., guix-commits, 2019/11/15
- 47/182: gnu: ghex: Update to 3.18.4., guix-commits, 2019/11/15
- 63/182: gnu: modem-manager: Update to 1.10.8., guix-commits, 2019/11/15
- 69/182: gnu: gnome-disk-utility: Don't create icon cache., guix-commits, 2019/11/15
- 70/182: gnu: devhelp: Don't create icon cache., guix-commits, 2019/11/15