amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: icedtea: Fix build.

Browse source 
* gnu/packages/java.scm (icedtea-8)[arguments]: Pass '-fcommon' to CFLAGS and
  CXXFLAGS. Add 'fix-openjdk' phase.
This commit is contained in:
Guillaume Le Vaillant 2021-09-14 21:39:05 +02:00
parent 1fec7c43f8
commit 4dbebca113
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/java.scm
View file

@ -1793,7 +1793,9 @@ IcedTea build harness.")
(srfi srfi-26))) (srfi srfi-26)))
((#:configure-flags flags) ((#:configure-flags flags)
`(let ((jdk (assoc-ref %build-inputs "jdk"))) `(let ((jdk (assoc-ref %build-inputs "jdk")))
`( ;;"--disable-bootstrap" `("CFLAGS=-fcommon"
"CXXFLAGS=-fcommon"
;;"--disable-bootstrap"
"--enable-bootstrap" "--enable-bootstrap"
"--enable-nss" "--enable-nss"
,(string-append "--with-parallel-jobs=" ,(string-append "--with-parallel-jobs="
@ -1858,6 +1860,13 @@ new Date();"))
(find-files "openjdk.src/jdk/src/solaris/native" (find-files "openjdk.src/jdk/src/solaris/native"
"\\.c|\\.h")) "\\.c|\\.h"))
#t))) #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 (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((doc (string-append (assoc-ref outputs "doc") (let ((doc (string-append (assoc-ref outputs "doc")