02/02: gnu: icedtea: Fix build.

[guix-commits]

glv pushed a commit to branch core-updates-frozen
in repository guix.

commit 4dbebca113d40f6679652a0f8410556c12ff04a3
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Tue Sep 14 21:39:05 2021 +0200

    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(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 03941ba..a5ea44b 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 <sys/sysctl.h>")
+                        "#include <linux/sysctl.h>"))))
                  (replace 'install
                    (lambda* (#:key outputs #:allow-other-keys)
                      (let ((doc (string-append (assoc-ref outputs "doc")