[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/17: gnu: pkg-config: Fix cross-compilation.
From: |
guix-commits |
Subject: |
16/17: gnu: pkg-config: Fix cross-compilation. |
Date: |
Mon, 2 Sep 2019 11:21:55 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-next
in repository guix.
commit a22d6fd491f37a3c0df50c240527847a18427ba6
Author: Mathieu Othacehe <address@hidden>
Date: Fri Jul 5 18:26:48 2019 +0200
gnu: pkg-config: Fix cross-compilation.
* gnu/packages/pkg-config.scm (%pkg-config)[arguments]: Add configure-flags
to disable tests that fail when cross-compiling.
---
gnu/packages/pkg-config.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm
index 6fc19a9..329a636 100644
--- a/gnu/packages/pkg-config.scm
+++ b/gnu/packages/pkg-config.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -48,7 +49,17 @@
(base32
"14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"))))
(build-system gnu-build-system)
- (arguments `(#:configure-flags '("--with-internal-glib")))
+ (arguments
+ `(#:configure-flags
+ '("--with-internal-glib"
+ ;; Those variables are guessed incorrectly when cross-compiling.
+ ;; See:
https://developer.gimp.org/api/2.0/glib/glib-cross-compiling.html.
+ ,@(if (%current-target-system)
+ '("glib_cv_stack_grows=no"
+ "glib_cv_uscore=no"
+ "ac_cv_func_posix_getpwuid_r=yes"
+ "ac_cv_func_posix_getgrgid_r=yes")
+ '()))))
(native-search-paths
(list (search-path-specification
(variable "PKG_CONFIG_PATH")
- 02/17: gnu: python: Fix cross compilation., (continued)
- 02/17: gnu: python: Fix cross compilation., guix-commits, 2019/09/02
- 06/17: gnu: xorg: Fix cross-compilation of multiple packages., guix-commits, 2019/09/02
- 08/17: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/09/02
- 12/17: gnu: help2man: Fix cross-compilation., guix-commits, 2019/09/02
- 14/17: gnu: libarchive: Fix cross-compilation., guix-commits, 2019/09/02
- 03/17: gnu: tcl: Fix cross-compilation., guix-commits, 2019/09/02
- 09/17: gnu: libgit2: Fix cross compilation., guix-commits, 2019/09/02
- 11/17: gnu: mit-krb5: Fix cross-compilation., guix-commits, 2019/09/02
- 07/17: gnu: python: Further cross-compilation fixes., guix-commits, 2019/09/02
- 15/17: gnu: tcsh: Fix cross-compilation., guix-commits, 2019/09/02
- 16/17: gnu: pkg-config: Fix cross-compilation.,
guix-commits <=
- 10/17: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/09/02
- 13/17: gnu: xmlto: Fix cross-compilation., guix-commits, 2019/09/02
- 17/17: gnu: alsa-utils: Fix cross-compilation., guix-commits, 2019/09/02