diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-11-25 23:12:42 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-11-25 23:12:42 +0100 |
| commit | 588a781396a96b2c2a7b1ab7bfa932b6d1faa763 (patch) | |
| tree | a3bcfed1607eadb329b8cc622b0a7f3776ce0bf2 /gnu/packages/pkg-config.scm | |
| parent | 90fad2880dd246bd42533bf6419903935e1f1400 (diff) | |
| download | guix-patches-588a781396a96b2c2a7b1ab7bfa932b6d1faa763.tar guix-patches-588a781396a96b2c2a7b1ab7bfa932b6d1faa763.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/pkg-config.scm')
| -rw-r--r-- | 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 8317136a24..62b0d5f65c 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 <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; ;;; 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. |