[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50201] [PATCH 45/52] gnu: Add pkg-config-for-build.
From: |
Maxime Devos |
Subject: |
[bug#50201] [PATCH 45/52] gnu: Add pkg-config-for-build. |
Date: |
Wed, 25 Aug 2021 20:03:25 +0200 |
* gnu/packages/pkg-config.scm
(pkg-config-for-build): New variable.
---
gnu/packages/pkg-config.scm | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm
index 9c632532be..9d1588338e 100644
--- a/gnu/packages/pkg-config.scm
+++ b/gnu/packages/pkg-config.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -21,8 +22,10 @@
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
+ #:use-module (gnu packages bash)
#:use-module (guix memoization)
#:export (pkg-config))
@@ -130,3 +133,36 @@ build, or a GNU triplet."
;; environment or not.
(define-syntax pkg-config
(identifier-syntax (pkg-config-for-target (%current-target-system))))
+
+;; This hack allows for using both "pkg-config" and "TARGET-pkg-config"
+;; at the same time. Simply using '%pkg-config' and 'pkg-config' won't
+;; work because they both use the "PKG_CONFIG_PATH" environment variable.
+(define-public pkg-config-for-build
+ (package
+ (inherit (hidden-package pkg-config))
+ (name "pkg-config-for-build")
+ (version "0")
+ (source #f)
+ (build-system trivial-build-system)
+ (inputs
+ `(("bash-minimal" ,bash-minimal)
+ ("pkg-config" ,%pkg-config)))
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ ,#~(begin
+ (use-modules (guix build utils))
+ (define where (string-append #$output "/bin/pkg-config"))
+ (mkdir-p (dirname where))
+ (call-with-output-file where
+ (lambda (port)
+ (format port "#!~a
+export PKG_CONFIG_PATH=\"$PKG_CONFIG_PATH_FOR_BUILD\"
+exec ~a \"$@\""
+ (search-input-file %build-inputs "bin/bash")
+ (search-input-file %build-inputs "bin/pkg-config"))))
+ (chmod where #o500))))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "PKG_CONFIG_PATH_FOR_BUILD")
+ (files '("lib/pkgconfig" "lib64/pkgconfig" "share/pkgconfig")))))))
--
2.33.0
- [bug#50201] [PATCH 50/52] gnu: gdk-pixbuf: Add bash-minimal input when cross-compiling., (continued)
- [bug#50201] [PATCH 50/52] gnu: gdk-pixbuf: Add bash-minimal input when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 52/52] gnu: at-spi2-atk: Don't compile tests when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 33/52] gnu: libthai: Add datrie as native-input when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 43/52] gnu: libxrandr: Add --disable-malloc0-returnsnull when necessary., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 51/52] gnu: pango: Add bash-minimal input when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 37/52] gnu: at-spi2-core: Don't cross-compile documentation., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 35/52] gnu: avahi: Find 'TARGET-pkg-config' when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 32/52] gnu: json-glib: Don't build introspection data when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 36/52] gnu: avahi: Use the cross-compiled bash., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 49/52] gnu: gdk-pixbuf: Find docbook when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 45/52] gnu: Add pkg-config-for-build.,
Maxime Devos <=
- [bug#50201] [PATCH 34/52] gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH core-updates-frozen 0/52] Support cross-compilation in glib-or-gtk-build-system and fix cross-compilation errors, Mathieu Othacehe, 2021/08/28
- [bug#50201] [PATCH core-updates-frozen 0/52] Support cross-compilation in glib-or-gtk-build-system and fix cross-compilation errors, Maxime Devos, 2021/08/30