ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openjdk: Fix library substitution when libraries aren't found.

Browse source 
* gnu/packages/java.scm (icedtea-8, openjdk9, openjdk11)[arguments]:
Change 'find-library' to always return a string.  Change 'find-library'
callers to use 'string-append' rather than 'format'.  Starting from
97a43db8b4, 'find-library' could return #f
and JNI substitutions would emit a literal "#f".

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Carlo Zancanaro 2021-04-20 21:22:20 +10:00 committed by Ludovic Courtès
parent 92b02d0c18
commit 522a48a228
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/java.scm
View file

@ -1800,9 +1800,10 @@ (define (icedtea-or-openjdk? path)
(search-path-as-string->list (search-path-as-string->list
(getenv "LIBRARY_PATH")))) (getenv "LIBRARY_PATH"))))
(find-library (lambda (name) (find-library (lambda (name)
(search-path (or (search-path
library-path library-path
(string-append "lib" name ".so"))))) (string-append "lib" name ".so"))
(string-append "lib" name ".so")))))
(for-each (for-each
(lambda (file) (lambda (file)
(catch 'decoding-error (catch 'decoding-error
@ -1810,9 +1811,9 @@ (define (icedtea-or-openjdk? path)
(substitute* file (substitute* file
(("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)" (("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)"
_ name version) _ name version)
(format #f "\"~a\"" (find-library name))) (string-append "\"" (find-library name) "\""))
(("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name) (("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name)
(format #f "\"~a\"" (find-library name))))) (string-append "\"" (find-library name) "\""))))
(lambda _ (lambda _
;; Those are safe to skip. ;; Those are safe to skip.
(format (current-error-port) (format (current-error-port)
@ -1955,9 +1956,9 @@ (define (icedtea-or-openjdk? path)
(substitute* file (substitute* file
(("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)" (("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)"
_ name version) _ name version)
(format #f "\"~a\"" (find-library name))) (string-append "\"" (find-library name) "\""))
(("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name) (("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name)
(format #f "\"~a\"" (find-library name))))) (string-append "\"" (find-library name) "\""))))
(lambda _ (lambda _
;; Those are safe to skip. ;; Those are safe to skip.
(format (current-error-port) (format (current-error-port)
@ -2158,9 +2159,10 @@ (define (icedtea-or-openjdk? path)
(search-path-as-string->list (search-path-as-string->list
(getenv "LIBRARY_PATH")))) (getenv "LIBRARY_PATH"))))
(find-library (lambda (name) (find-library (lambda (name)
(search-path (or (search-path
library-path library-path
(string-append "lib" name ".so"))))) (string-append "lib" name ".so"))
(string-append "lib" name ".so")))))
(for-each (for-each
(lambda (file) (lambda (file)
(catch 'decoding-error (catch 'decoding-error
@ -2168,9 +2170,9 @@ (define (icedtea-or-openjdk? path)
(substitute* file (substitute* file
(("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)" (("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)"
_ name version) _ name version)
(format #f "\"~a\"" (find-library name))) (string-append "\"" (find-library name) "\""))
(("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name) (("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name)
(format #f "\"~a\"" (find-library name))))) (string-append "\"" (find-library name) "\""))))
(lambda _ (lambda _
;; Those are safe to skip. ;; Those are safe to skip.
(format (current-error-port) (format (current-error-port)