guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: icedtea-8: Hardcode dynamically loaded libraries.


From: ???
Subject: 01/01: gnu: icedtea-8: Hardcode dynamically loaded libraries.
Date: Sun, 11 Sep 2016 02:10:37 +0000 (UTC)

iyzsong pushed a commit to branch master
in repository guix.

commit cab1760de21938172494a05f93f3848840717852
Author: 宋文武 <address@hidden>
Date:   Thu Sep 8 23:25:23 2016 +0800

    gnu: icedtea-8: Hardcode dynamically loaded libraries.
    
    Fixes <https://bugs.gnu.org/24327>.
    
    * gnu/packages/java.scm (icedtea-8)[arguments]: Add 'patch-jni-libs' phase.
---
 gnu/packages/java.scm |   27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7387235..36c10d0 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -994,6 +994,33 @@ build process and its dependencies, whereas Make uses 
Makefile format.")
              (delete 'patch-paths)
              (delete 'set-additional-paths)
              (delete 'patch-patches)
+             (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 'encoding-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 "openjdk.src/jdk/src/solaris/native"
+                                "\\.c|\\.h"))
+                   #t)))
              ;; FIXME: This phase is needed but fails with this version of
              ;; IcedTea.
              (delete 'install-keystore)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]