[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/104: gnu: rottlog: Fix aarch64 cross-compilation.
From: |
guix-commits |
Subject: |
07/104: gnu: rottlog: Fix aarch64 cross-compilation. |
Date: |
Sun, 17 May 2020 11:36:24 -0400 (EDT) |
nckx pushed a commit to branch core-updates
in repository guix.
commit 7ed113e1a53c9f39a4cbd3f4b7652582e84849e7
Author: Mathieu Othacehe <address@hidden>
AuthorDate: Fri May 15 13:36:45 2020 +0200
gnu: rottlog: Fix aarch64 cross-compilation.
* gnu/packages/admin.scm (rottlog)[arguments]: Add a 'fix-configure phase to
replace outdated config.sub and config.guess, without aarch64 support,
[native-inputs]: add "automake".
---
gnu/packages/admin.scm | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 6083691..9822ba8 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1229,7 +1229,7 @@ at once based on a Perl regular expression.")
#t))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags (list "ROTT_ETCDIR=/etc/rottlog" ;rc file location
+ `(#:configure-flags (list "ROTT_ETCDIR=/etc/rottlog" ;rc file location
"--localstatedir=/var")
;; Install example config files in OUT/etc.
@@ -1243,6 +1243,20 @@ at once based on a Perl regular expression.")
(substitute* "rc/rc"
(("/usr/sbin/sendmail") "sendmail"))
#t))
+ (add-after 'unpack 'fix-configure
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ ;; Replace outdated config.sub and config.guess:
+ (for-each (lambda (file)
+ (install-file
+ (string-append
+ (assoc-ref
+ (or native-inputs inputs) "automake")
+ "/share/automake-"
+ ,(version-major+minor
+ (package-version automake))
+ "/" file) "."))
+ '("config.sub" "config.guess"))
+ #t))
(add-after 'build 'set-packdir
(lambda _
;; Set a default location for archived logs.
@@ -1263,6 +1277,7 @@ at once based on a Perl regular expression.")
(lambda _
(invoke "make" "install-info"))))))
(native-inputs `(("texinfo" ,texinfo)
+ ("automake" ,automake)
("util-linux" ,util-linux))) ; for 'cal'
(home-page "https://www.gnu.org/software/rottlog/")
(synopsis "Log rotation and management")
- branch core-updates updated (8d33f26 -> 19c2876), guix-commits, 2020/05/17
- 01/104: gnu: openjdk9: Simplify snippet., guix-commits, 2020/05/17
- 02/104: gnu: openjdk9: Build in parallel., guix-commits, 2020/05/17
- 03/104: gnu: openjdk10: Simplify snippet., guix-commits, 2020/05/17
- 06/104: gnu: openjdk12: Simplify snippet., guix-commits, 2020/05/17
- 05/104: gnu: openjdk11: Build in parallel., guix-commits, 2020/05/17
- 07/104: gnu: rottlog: Fix aarch64 cross-compilation.,
guix-commits <=
- 09/104: gnu: ocaml-octavius: Update to 1.2.2., guix-commits, 2020/05/17
- 12/104: gnu: emacs-flycheck: Update to 31-2.9bcf6b6., guix-commits, 2020/05/17
- 13/104: gnu: bitcoin-unlimited: Update to 1.8.0.0., guix-commits, 2020/05/17
- 10/104: gnu: ocaml-fileutils: Update to 0.6.2., guix-commits, 2020/05/17
- 11/104: gnu: ocaml-ocurl: Update to 0.9.1., guix-commits, 2020/05/17
- 15/104: gnu: tor: Update to 0.4.3.5., guix-commits, 2020/05/17
- 14/104: gnu: bitcoin-abc: Update to 0.21.6., guix-commits, 2020/05/17
- 17/104: gnu: openconnect: Update to 8.10 [fixes CVE-2020-12823]., guix-commits, 2020/05/17
- 19/104: gnu: clamav: Update to 0.102.3., guix-commits, 2020/05/17
- 08/104: news: Add ‘de’ translation., guix-commits, 2020/05/17