futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: openjdk10: Fix build.

Browse Source 
* gnu/packages/java.scm (openjdk10)[arguments]: Pass '-fcommon' to CFLAGS.
  Add 'disable-warnings-as-errors' phase.
  [native-inputs]: Add gcc-9.
This commit is contained in:
Guillaume Le Vaillant 2021-09-15 15:03:29 +02:00
parent a2131c12be
commit 988eb0d512
No known key found for this signature in database
GPG Key ID: 6BE8208ADF21FE3F
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/java.scm
View File

@ -2138,6 +2138,7 @@ new Date();"))
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(invoke "bash" "./configure" (invoke "bash" "./configure"
"--with-extra-cflags=-fcommon"
(string-append "--with-freetype=" (assoc-ref inputs "freetype")) (string-append "--with-freetype=" (assoc-ref inputs "freetype"))
"--disable-freetype-bundling" "--disable-freetype-bundling"
"--disable-warnings-as-errors" "--disable-warnings-as-errors"
@ -2145,13 +2146,19 @@ new Date();"))
"--with-giflib=system" "--with-giflib=system"
"--with-libjpeg=system" "--with-libjpeg=system"
"--with-native-debug-symbols=zipped" "--with-native-debug-symbols=zipped"
(string-append "--prefix=" (assoc-ref outputs "out"))) (string-append "--prefix=" (assoc-ref outputs "out")))))
#t)))) (add-after 'unpack 'disable-warnings-as-errors
(lambda _
;; It looks like the "--disable-warnings-as-errors" option of
;; the 'configure' phase is not working.
(substitute* "make/autoconf/generated-configure.sh"
(("-Werror") ""))))))
((#:disallowed-references _ '()) ((#:disallowed-references _ '())
`(,(gexp-input openjdk9) `(,(gexp-input openjdk9)
,(gexp-input openjdk9 "jdk"))))) ,(gexp-input openjdk9 "jdk")))))
(native-inputs (native-inputs
`(("openjdk9" ,openjdk9) `(("gcc" ,gcc-9) ; FIXME: segmentation faults when using gcc-10.
("openjdk9" ,openjdk9)
("openjdk9:jdk" ,openjdk9 "jdk") ("openjdk9:jdk" ,openjdk9 "jdk")
("make@4.2" ,gnu-make-4.2) ("make@4.2" ,gnu-make-4.2)
("unzip" ,unzip) ("unzip" ,unzip)