[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#50299: [PATCH v5 10/24] gnu: swi-prolog: Correct reference to 'bin/s
From: |
Maxime Devos |
Subject: |
bug#50299: [PATCH v5 10/24] gnu: swi-prolog: Correct reference to 'bin/swi-prolog'. |
Date: |
Fri, 4 Mar 2022 13:01:05 +0000 |
* gnu/packages/prolog.scm
(swi-prolog)[arguments]<#:phases>{fix-cross-references}: New phase.
---
gnu/packages/prolog.scm | 37 ++++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm
index 00f09b49cc..86ac2c2bb1 100644
--- a/gnu/packages/prolog.scm
+++ b/gnu/packages/prolog.scm
@@ -120,19 +120,30 @@ manner. It also features an interactive interpreter.")
"-DINSTALL_DOCUMENTATION=ON"
"-DSWIPL_INSTALL_IN_LIB=OFF") ; FIXME: Breaks RUNPATH validation.
#:phases
- (modify-phases %standard-phases
- ;; XXX: Delete the test phase that attempts to write to the
- ;; immutable store.
- (add-after 'unpack 'delete-failing-tests
- (lambda _
- (substitute* "src/CMakeLists.txt"
- ((" save") ""))
- (substitute* "src/test.pl"
- (("testdir\\('Tests/save'\\).") ""))
- (with-directory-excursion "src/Tests"
- (for-each delete-file-recursively
- '("save")))
- #t)))))
+ ,#~(modify-phases %standard-phases
+ ;; XXX: Delete the test phase that attempts to write to the
+ ;; immutable store.
+ (add-after 'unpack 'delete-failing-tests
+ (lambda _
+ (substitute* "src/CMakeLists.txt"
+ ((" save") ""))
+ (substitute* "src/test.pl"
+ (("testdir\\('Tests/save'\\).") ""))
+ (with-directory-excursion "src/Tests"
+ (for-each delete-file-recursively
+ '("save")))
+ #t))
+ #$@(if (%current-target-system)
+ ;; Prevent man_server.pl and swipl-lfr.pl from keeping a
+ ;; reference to the native swi-prolog.
+ ;; FIXME: libswipl.so and swipl-ld keep a reference to the
+ ;; cross-compiler.
+ #~((add-after 'install 'fix-cross-references
+ (lambda _
+ (define bin `(,(string-append #$output "/bin")))
+ (for-each (lambda (file) (patch-shebang file bin))
+ (find-files #$output ".pl$")))))
+ #~()))))
(native-inputs
`(,@(if (%current-target-system)
(begin
--
2.30.2
- bug#50299: [PATCH v5 20/24] gnu: lablgtk: Run tests conditionally., (continued)
- bug#50299: [PATCH v5 20/24] gnu: lablgtk: Run tests conditionally., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 06/24] gnu: swi-prolog: Make configuration wok when cross-compiling., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 14/24] gnu: go-1.16: Don't run tests when cross-compiling., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 17/24] gnu: libicns: Run tests conditionally., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 03/24] gnu: lean: Add bash-minimal., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 05/24] gnu: swi-prolog: Run tests conditionally., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 12/24] gnu: ruby-ffi-rzmq: Run tests conditionally., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 18/24] gnu: python2-empy: Run tests conditionally., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 01/24] lint: check-tests-true: Allow #:tests? #t for some build systems., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 09/24] gnu: swi-prolog: Set PROG_SWIPL when cross-compiling., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 10/24] gnu: swi-prolog: Correct reference to 'bin/swi-prolog'.,
Maxime Devos <=
- bug#50299: [PATCH v5 04/24] gnu: swi-prolog: Move native-inputs to inputs where appropriate., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 24/24] gnu: ghc-bsb-http-chunked: Don't run tests when cross-compiling., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 19/24] gnu: python2-promise: Run tests conditionally., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 21/24] gnu: belcard: Run tests conditionally., Maxime Devos, 2022/03/04
- bug#50299: [PATCH v5 08/24] gnu: swi-prolog: Use cross-compiled bash in shebangs., Maxime Devos, 2022/03/04
- bug#50299: The check-tests-true lint check is incorrect for Emacs packages, Maxim Cournoyer, 2022/03/11