Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2024-11-23 00:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nonguix: Fix default values for patchelf-plan and install-plan.

Browse source 
* nonguix/build-system/binary.scm (binary-build): Default values are unquoted,
  so we add an extra quote.
This commit is contained in:
Pierre Neidhardt 2019-12-18 17:00:38 +01:00
parent d622a15d08
commit a35038fb8d
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nonguix/build-system/binary.scm
View file

@ -93,8 +93,8 @@
(define* (binary-build store name inputs (define* (binary-build store name inputs
#:key (guile #f) #:key (guile #f)
(outputs '("out")) (outputs '("out"))
(patchelf-plan '()) (patchelf-plan ''())
(install-plan '(("" ".*"))) (install-plan ''(("." (".") "./")))
(search-paths '()) (search-paths '())
(out-of-source? #t) (out-of-source? #t)
(validate-runpath? #t) (validate-runpath? #t)

35
nonguix/build/binary-build-system.scm
View file

@ -97,22 +97,25 @@ The inputs are optional when the file is an executable."
":"))) ":")))
(invoke "patchelf" "--set-rpath" rpath binary))) (invoke "patchelf" "--set-rpath" rpath binary)))
#t) #t)
(let ((interpreter (car (find-files (assoc-ref inputs "libc") "ld-linux.*\\.so")))
(interpreter32 (car (find-files (assoc-ref inputs "libc32") "ld-linux.*\\.so")))) (when (and patchelf-plan
(for-each (not (null? patchelf-plan)))
(lambda (plan) (let ((interpreter (car (find-files (assoc-ref inputs "libc") "ld-linux.*\\.so")))
(match plan (interpreter32 (car (find-files (assoc-ref inputs "libc32") "ld-linux.*\\.so"))))
((binary runpath) (for-each
(binary-patch binary (if (64-bit? binary) (lambda (plan)
interpreter (match plan
interpreter32) ((binary runpath)
runpath)) (binary-patch binary (if (64-bit? binary)
((binary) interpreter
(binary-patch binary (if (64-bit? binary) interpreter32)
interpreter runpath))
interpreter32) ((binary)
#f)))) (binary-patch binary (if (64-bit? binary)
patchelf-plan)) interpreter
interpreter32)
#f))))
patchelf-plan)))
#t) #t)
(define %standard-phases (define %standard-phases