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
1b6f99ea53 would otherwise entail.
This commit is contained in:
Ludovic Courtès 2019-10-07 10:38:22 +02:00
parent 7b6a8e23b0
commit 048d21a873
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 5 deletions

View File

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