[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
18/52: gnu: bdb: Fix cross-compilation build errors.
From: |
guix-commits |
Subject: |
18/52: gnu: bdb: Fix cross-compilation build errors. |
Date: |
Mon, 20 Sep 2021 07:19:31 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates-frozen
in repository guix.
commit 0d7888acf0791d1260ebf3f37ec50ad1dfcf359e
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 14:35:44 2021 +0200
gnu: bdb: Fix cross-compilation build errors.
* gnu/packages/dbm.scm
(bdb-4.8)[arguments]<#:phases>{update-config.sub}: Update 'config.sub'
when cross-compiling for 'powerpc64le' or 'aarch64'.
---
gnu/packages/dbm.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm
index ce84ef9..607e4ae 100644
--- a/gnu/packages/dbm.scm
+++ b/gnu/packages/dbm.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -24,6 +25,7 @@
(define-module (gnu packages dbm)
#:use-module (gnu packages)
+ #:use-module (gnu packages autotools)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
@@ -57,6 +59,19 @@
#:disallowed-references ("doc")
#:phases
(modify-phases %standard-phases
+ ;; The configure script is too old to recognise aarch64 and
+ ;; powerpc64le as valid architectures. The trick below works
+ ;; for "--build", but not for "--host", so update config.sub.
+ ,@(if (and (%current-target-system)
+ (or (target-ppc64le? (%current-target-system))
+ (target-aarch64? (%current-target-system))))
+ `((add-after 'unpack 'update-config.sub
+ (lambda* (#:key native-inputs #:allow-other-keys)
+ (delete-file "dist/config.sub")
+ (symlink
+ (search-input-file native-inputs "/bin/config.sub")
+ "dist/config.sub"))))
+ '())
(replace 'configure
(lambda* (#:key target outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
@@ -97,6 +112,12 @@
;; of db_cxx.h into C++ files works; it leads to
;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
"--enable-cxx")))))))
+ (native-inputs
+ (if (and (%current-target-system)
+ (or (target-ppc64le? (%current-target-system))
+ (target-aarch64? (%current-target-system))))
+ `(("config" ,config)) ; for config.sub
+ '()))
(synopsis "Berkeley database")
(description
"Berkeley DB is an embeddable database allowing developers the choice of
- branch core-updates-frozen updated (4bacf9c -> aacaa22), guix-commits, 2021/09/20
- 02/52: gnu: elogind: Make #:configure-flags a G-exp., guix-commits, 2021/09/20
- 01/52: gnu: dbus-glib: Support cross-compilation., guix-commits, 2021/09/20
- 07/52: gnu: nspr: Don't retain references to native inputs., guix-commits, 2021/09/20
- 11/52: build-system/glib-or-gtk: Support cross-compilaton., guix-commits, 2021/09/20
- 23/52: gnu: heimdal: Fix inputs when cross-compiling., guix-commits, 2021/09/20
- 24/52: gnu: heimdal: Fix linking error when cross-compiling., guix-commits, 2021/09/20
- 12/52: gnu: dbus-cairo: Add missing bash-minimal input., guix-commits, 2021/09/20
- 18/52: gnu: bdb: Fix cross-compilation build errors.,
guix-commits <=
- 06/52: gnu: nspr: Adjust to Mozilla cross-compilation conventions., guix-commits, 2021/09/20
- 13/52: gnu: polkit: Prevent cross-compilation build error., guix-commits, 2021/09/20
- 17/52: gnu: atk: Disable introspection when cross-compiling., guix-commits, 2021/09/20
- 16/52: gobject-introspection: Correct library name when cross-compiling., guix-commits, 2021/09/20
- 34/52: gnu: libdaemon: Support cross-compilation to aarch64-linux-gnu., guix-commits, 2021/09/20
- 35/52: gnu: avahi: Find 'TARGET-pkg-config' when cross-compiling., guix-commits, 2021/09/20
- 28/52: gnu: heimdal: Use libcom_err from input when cross-compiling., guix-commits, 2021/09/20
- 21/52: gnu: gamin: Fix 'configure' script when cross-compiling., guix-commits, 2021/09/20
- 09/52: gnu: poppler: Find pkg-config when cross-compiling., guix-commits, 2021/09/20
- 19/52: gnu: graphene: Don't build introspection data when cross-compiling., guix-commits, 2021/09/20