[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: openjdk9: Fix build.
From: |
guix-commits |
Subject: |
01/02: gnu: openjdk9: Fix build. |
Date: |
Wed, 15 Sep 2021 09:43:04 -0400 (EDT) |
glv pushed a commit to branch core-updates-frozen
in repository guix.
commit a2131c12bec62673bcd9bd51891df862884a1c37
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Wed Sep 15 10:40:05 2021 +0200
gnu: openjdk9: Fix build.
* gnu/packages/java.scm (openjdk9)[arguments]: Pass '-fcommon' to CFLAGS.
[native-inputs]: Add gcc-9.
---
gnu/packages/java.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 0ac5234..2a48612 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -60,6 +60,7 @@
#: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 @@ new Date();"))
(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 @@ new Date();"))
("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)