From 4dbebca113d40f6679652a0f8410556c12ff04a3 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 14 Sep 2021 21:39:05 +0200 Subject: gnu: icedtea: Fix build. * gnu/packages/java.scm (icedtea-8)[arguments]: Pass '-fcommon' to CFLAGS and CXXFLAGS. Add 'fix-openjdk' phase. --- gnu/packages/java.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 03941ba460..a5ea44ba5b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1793,7 +1793,9 @@ IcedTea build harness.") (srfi srfi-26))) ((#:configure-flags flags) `(let ((jdk (assoc-ref %build-inputs "jdk"))) - `( ;;"--disable-bootstrap" + `("CFLAGS=-fcommon" + "CXXFLAGS=-fcommon" + ;;"--disable-bootstrap" "--enable-bootstrap" "--enable-nss" ,(string-append "--with-parallel-jobs=" @@ -1858,6 +1860,13 @@ new Date();")) (find-files "openjdk.src/jdk/src/solaris/native" "\\.c|\\.h")) #t))) + (replace 'fix-openjdk + (lambda _ + (substitute* + '("openjdk.src/jdk/src/solaris/native/java/net/PlainSocketImpl.c" + "openjdk.src/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c") + (("#include ") + "#include ")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((doc (string-append (assoc-ref outputs "doc") -- cgit 1.4.1