[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: pkg-config: Add pkg.m4 to the cross pkg-config.
From: |
Ludovic Courtès |
Subject: |
01/01: gnu: pkg-config: Add pkg.m4 to the cross pkg-config. |
Date: |
Tue, 25 Nov 2014 22:14:35 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 588a781396a96b2c2a7b1ab7bfa932b6d1faa763
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 25 23:12:42 2014 +0100
gnu: pkg-config: Add pkg.m4 to the cross pkg-config.
Suggested by John Darrington.
* gnu/packages/pkg-config.scm (cross-pkg-config): Make
$out/share/aclocal a symlink to %PKG-CONFIG/share/aclocal.
---
gnu/packages/pkg-config.scm | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm
index 8317136..62b0d5f 100644
--- a/gnu/packages/pkg-config.scm
+++ b/gnu/packages/pkg-config.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -71,13 +71,11 @@ instance.")))
#:builder (begin
(use-modules (guix build utils))
- (let* ((out (assoc-ref %outputs "out"))
- (bin (string-append out "/bin"))
- (prog (string-append ,target "-pkg-config"))
- (native
- (string-append
- (assoc-ref %build-inputs "pkg-config")
- "/bin/pkg-config")))
+ (let* ((in (assoc-ref %build-inputs "pkg-config"))
+ (out (assoc-ref %outputs "out"))
+ (bin (string-append out "/bin"))
+ (prog (string-append ,target "-pkg-config"))
+ (native (string-append in "/bin/pkg-config")))
(mkdir-p bin)
@@ -85,7 +83,13 @@ instance.")))
;; This satisfies the pkg.m4 macros, which use
;; AC_PROG_TOOL to determine the `pkg-config' program
;; name.
- (symlink native (string-append bin "/" prog))))))
+ (symlink native (string-append bin "/" prog))
+
+ ;; Also make 'pkg.m4' available, some packages might
+ ;; expect it.
+ (mkdir-p (string-append out "/share"))
+ (symlink (string-append in "/share/aclocal")
+ (string-append out "/share/aclocal"))))))
(native-inputs `(("pkg-config" ,%pkg-config)))
;; Ignore native inputs, and set `PKG_CONFIG_PATH' for target inputs.