diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-10-07 10:38:22 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-10-07 10:44:10 +0200 |
| commit | 048d21a8733f4173705ed59a22a03caddb876fe1 (patch) | |
| tree | 213508095b7374d325488867e3c1e38321f9950c /gnu | |
| parent | 7b6a8e23b0de18262a42e44432f955517d71d796 (diff) | |
| download | guix-048d21a8733f4173705ed59a22a03caddb876fe1.tar.gz guix-048d21a8733f4173705ed59a22a03caddb876fe1.zip | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/java.scm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 452180eead..1f5e39d9c6 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)) |