01/01: gnu: icedtea-7: Avoid massive rebuild.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 048d21a8733f4173705ed59a22a03caddb876fe1
Author: Ludovic Courtès <address@hidden>
Date:   Mon Oct 7 10:38:22 2019 +0200

    gnu: icedtea-7: Avoid massive rebuild.
    
    Reported by Efraim Flashner.
    
    * gnu/packages/java.scm (icedtea-7)[arguments]: Change 'lib-path'
    definition in 'install-libjvm' to avoid the rebuilds that commit
    1b6f99ea538d767099596860017e67755c1ac42f would otherwise entail.
---
 gnu/packages/java.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 452180e..1f5e39d 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1376,18 +1376,17 @@ bootstrapping purposes.")
            (add-after 'install 'install-libjvm
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let* ((lib-path (string-append (assoc-ref outputs "out")
-                                               "/lib/"
                                                ;; See 'INSTALL_ARCH_DIR' in
                                                ;; 'configure'.
                                                ,(match (%current-system)
                                                   ("i686-linux"
-                                                   "i386")
+                                                   "/lib/i386")
                                                   ("x86_64-linux"
-                                                   "amd64")
+                                                   "/lib/amd64")
                                                   ("armhf-linux"
-                                                   "arm")
+                                                   "/lib/arm")
                                                   ("aarch64-linux"
-                                                   "aarch64")))))
+                                                   "/lib/aarch64")))))
                  (symlink (string-append lib-path "/server/libjvm.so")
                           (string-append lib-path "/libjvm.so")))
                #t))