diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-04-21 12:53:54 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-05-01 17:12:28 +0200 |
| commit | 78789cb6e26b59b3fb863854b7c8d99401dc7620 (patch) | |
| tree | 4dca0968442bc826fda757b0377596a50f42a8c5 /gnu | |
| parent | 668384d160b58cd137072c34e66e65e1c11851d4 (diff) | |
gnu: openjdk: Disallow references to the JDK used for build.
This ensures JDKs don't unintentionally keep references to the one used
to build them, as reported at <https://issues.guix.gnu.org/31719#7> and
fixed by 97a43db8b4416a1450aa61737edba9cf4126cf1c.
* gnu/packages/java.scm (icedtea-8)[arguments]: Add #:disallowed-references.
(openjdk9)[arguments]: Likewise.
(openjdk10)[arguments]: Likewise.
(openjdk11)[arguments]: Likewise.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/java.scm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3cd976685c0..8a1ba5f2629 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm | |||
| @@ -1749,6 +1749,9 @@ IcedTea build harness.") | |||
| 1749 | ((guix build ant-build-system) | 1749 | ((guix build ant-build-system) |
| 1750 | (guix build syscalls) | 1750 | (guix build syscalls) |
| 1751 | ,@%gnu-build-system-modules) | 1751 | ,@%gnu-build-system-modules) |
| 1752 | |||
| 1753 | #:disallowed-references ((,icedtea-7 "jdk")) | ||
| 1754 | |||
| 1752 | ,@(substitute-keyword-arguments (package-arguments icedtea-7) | 1755 | ,@(substitute-keyword-arguments (package-arguments icedtea-7) |
| 1753 | ((#:modules modules) | 1756 | ((#:modules modules) |
| 1754 | `((guix build utils) | 1757 | `((guix build utils) |
| @@ -1902,6 +1905,9 @@ new Date();")) | |||
| 1902 | #:imported-modules | 1905 | #:imported-modules |
| 1903 | ((guix build syscalls) | 1906 | ((guix build syscalls) |
| 1904 | ,@%gnu-build-system-modules) | 1907 | ,@%gnu-build-system-modules) |
| 1908 | |||
| 1909 | #:disallowed-references (,icedtea-8 (,icedtea-8 "jdk")) | ||
| 1910 | |||
| 1905 | #:phases | 1911 | #:phases |
| 1906 | (modify-phases %standard-phases | 1912 | (modify-phases %standard-phases |
| 1907 | (add-after 'patch-source-shebangs 'fix-java-shebangs | 1913 | (add-after 'patch-source-shebangs 'fix-java-shebangs |
| @@ -2097,7 +2103,9 @@ new Date();")) | |||
| 2097 | "--with-libjpeg=system" | 2103 | "--with-libjpeg=system" |
| 2098 | "--with-native-debug-symbols=zipped" | 2104 | "--with-native-debug-symbols=zipped" |
| 2099 | (string-append "--prefix=" (assoc-ref outputs "out"))) | 2105 | (string-append "--prefix=" (assoc-ref outputs "out"))) |
| 2100 | #t)))))) | 2106 | #t)))) |
| 2107 | ((#:disallowed-references _ '()) | ||
| 2108 | `(,openjdk9 (,openjdk9 "jdk"))))) | ||
| 2101 | (native-inputs | 2109 | (native-inputs |
| 2102 | `(("openjdk9" ,openjdk9) | 2110 | `(("openjdk9" ,openjdk9) |
| 2103 | ("openjdk9:jdk" ,openjdk9 "jdk") | 2111 | ("openjdk9:jdk" ,openjdk9 "jdk") |
| @@ -2127,6 +2135,9 @@ new Date();")) | |||
| 2127 | (arguments | 2135 | (arguments |
| 2128 | `(#:imported-modules ((guix build syscalls) | 2136 | `(#:imported-modules ((guix build syscalls) |
| 2129 | ,@%gnu-build-system-modules) | 2137 | ,@%gnu-build-system-modules) |
| 2138 | |||
| 2139 | #:disallowed-references (,openjdk10 (,openjdk10 "jdk")) | ||
| 2140 | |||
| 2130 | #:tests? #f; requires jtreg | 2141 | #:tests? #f; requires jtreg |
| 2131 | ;; TODO package jtreg | 2142 | ;; TODO package jtreg |
| 2132 | #:configure-flags | 2143 | #:configure-flags |
