[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: openjdk@11: Add phase to hardcode libraries.
From: |
guix-commits |
Subject: |
02/03: gnu: openjdk@11: Add phase to hardcode libraries. |
Date: |
Fri, 12 Feb 2021 05:47:48 -0500 (EST) |
leoprikler pushed a commit to branch master
in repository guix.
commit 44425e1f2a96aee39a21dff634abb9b77b44261e
Author: Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
AuthorDate: Fri Feb 12 00:20:53 2021 +0100
gnu: openjdk@11: Add phase to hardcode libraries.
This fixes a NullPointerException related to using fontconfig,
see also <https://bugs.gnu.org/41177>.
* gnu/packages/java.scm (openjdk11)[arguments]: Add patch-jni-libs phase.
Signed-off-by: Leo Prikler <leo.prikler@student.tugraz.at>
---
gnu/packages/java.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index a63dad8..85ca37d 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -2139,6 +2139,33 @@ new Date();"))
(substitute*
"make/data/blacklistedcertsconverter/blacklisted.certs.pem"
(("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n"))
#t))
+ (add-after 'unpack 'patch-jni-libs
+ ;; Hardcode dynamically loaded libraries.
+ (lambda _
+ (let* ((library-path (search-path-as-string->list
+ (getenv "LIBRARY_PATH")))
+ (find-library (lambda (name)
+ (search-path
+ library-path
+ (string-append "lib" name ".so")))))
+ (for-each
+ (lambda (file)
+ (catch 'decoding-error
+ (lambda ()
+ (substitute* file
+ (("VERSIONED_JNI_LIB_NAME\\(\"(.*)\", \"(.*)\"\\)"
+ _ name version)
+ (format #f "\"~a\"" (find-library name)))
+ (("JNI_LIB_NAME\\(\"(.*)\"\\)" _ name)
+ (format #f "\"~a\"" (find-library name)))))
+ (lambda _
+ ;; Those are safe to skip.
+ (format (current-error-port)
+ "warning: failed to substitute: ~a~%"
+ file))))
+ (find-files "."
+ "\\.c$|\\.h$"))
+ #t)))
(add-before 'build 'write-source-revision-file
(lambda _
(with-output-to-file ".src-rev"