From 5875c4b7babfb0f83bd7b219070b1e8fce0e5393 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Tue, 26 Mar 2024 13:28:49 +0800 Subject: gnu: startup-notification: Fix cross-compilation to {riscv,aarch}64-linux-gnu. * gnu/packages/xdisorg.scm (startup-notification) [arguments]: When cross-compilation to {riscv,aarch}64-linux-gnu, add update-config-scripts phase. Add configure-flags. [native-inputs]: When cross compiling to {riscv,aarch}64-linux-gnu, add config. Change-Id: Iad7220e2a74c7bed706f3cb092e9ead5c94dc5bd --- gnu/packages/xdisorg.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c041ab1fc01..30f10c0e7c4 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -905,7 +905,33 @@ tracking.") (base32 "0jmyryrpqb35y9hd5sgxqy2z0r1snw7d3ljw0jak0n0cjdz1yf9w")))) (build-system gnu-build-system) - (native-inputs (list pkg-config)) + (arguments + (if (and (or (target-riscv64?) + (target-aarch64?)) + (%current-target-system)) + (list + #:configure-flags #~(list + ;; when cross-compilation, skip realloc checking + "lf_cv_sane_realloc=yes" + (string-append "PKG_CONFIG=" #$(pkg-config-for-target))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'update-config-scripts + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.guess and config.sub. + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) ".")) + '("config.guess" "config.sub")))))) + '())) + (native-inputs (append (if (and (or (target-riscv64?) + (target-aarch64?)) + (%current-target-system)) + (list config) + '()) + (list pkg-config))) (inputs (list libx11 xcb-util)) (home-page "https://www.freedesktop.org/wiki/Software/startup-notification/") -- cgit v1.2.3