ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-03 09:58:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openjdk9: Fix build.

Browse source 
* gnu/packages/java.scm (openjdk9)[arguments]: Pass '-fcommon' to CFLAGS.
  [native-inputs]: Add gcc-9.
This commit is contained in:
Guillaume Le Vaillant 2021-09-15 10:40:05 +02:00
parent 16c66d1d67
commit a2131c12be
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/java.scm
View file

@ -60,6 +60,7 @@ (define-module (gnu packages java)
#:use-module (gnu packages elf)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gl)
#:use-module (gnu packages ghostscript) ;lcms
@ -1961,6 +1962,7 @@ (define-public openjdk9
(lambda* (#:key inputs outputs #:allow-other-keys)
;; TODO: unbundle libpng and lcms
(invoke "bash" "./configure"
"--with-extra-cflags=-fcommon"
(string-append "--with-freetype=" (assoc-ref inputs "freetype"))
"--disable-freetype-bundling"
"--disable-warnings-as-errors"
@ -2089,7 +2091,8 @@ (define (icedtea-or-openjdk? path)
("libxt" ,libxt)
("libxtst" ,libxtst)))
(native-inputs
`(("icedtea-8" ,icedtea-8)
`(("gcc" ,gcc-9) ; FIXME: segmentation faults when using gcc-10.
("icedtea-8" ,icedtea-8)
("icedtea-8:jdk" ,icedtea-8 "jdk")
;; XXX: The build system fails with newer versions of GNU Make.
("make@4.2" ,gnu-make-4.2)