me/guix
Archived
1
0
Fork 0
Code Activity

gnu: icedtea-7: Use icedtea-6 for bootstrapping.

Browse source 
* gnu/packages/java.scm (icedtea-7)[source]: Remove Makefile.in patch to link
with GCJ libs.
[arguments]: Remove (ice-9 rdelim) module; adjust configure flags; do not add
GCJ headers to CPATH in build phase "set-additional-paths".
[native-inputs]: Remove gcj and ant; add icedtea-6 and ant-bootstrap.  Remove
autoconf and automake.
(icedtea-8)[native-inputs]: Delete "icedtea" from the inherited inputs, not
"gcj".
This commit is contained in:
Ricardo Wurmus 2017-05-15 19:44:12 +02:00
parent 9841931668
commit e2098e2d58
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 40 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/java.scm
View file

@ -1344,9 +1344,6 @@ bootstrapping purposes.")
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(substitute* "Makefile.in" '(substitute* "Makefile.in"
;; link against libgcj to avoid linker error
(("-o native-ecj")
"-lgcj -o native-ecj")
;; do not leak information about the build host ;; do not leak information about the build host
(("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"") (("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"")
"DISTRIBUTION_ID=\"\\\"guix\\\"\""))))) "DISTRIBUTION_ID=\"\\\"guix\\\"\"")))))
@ -1376,15 +1373,10 @@ bootstrapping purposes.")
(guix build gnu-build-system) (guix build gnu-build-system)
(ice-9 match) (ice-9 match)
(ice-9 popen) (ice-9 popen)
(ice-9 rdelim)
(srfi srfi-19) (srfi srfi-19)
(srfi srfi-26)) (srfi srfi-26))
#:configure-flags #:configure-flags
(let* ((gcjdir (assoc-ref %build-inputs "gcj"))
(ecj (string-append gcjdir "/share/java/ecj.jar"))
(jdk (string-append gcjdir "/lib/jvm/"))
(gcj (string-append gcjdir "/bin/gcj")))
;; TODO: package pcsc and sctp, and add to inputs ;; TODO: package pcsc and sctp, and add to inputs
`("--disable-system-pcsc" `("--disable-system-pcsc"
"--disable-system-sctp" "--disable-system-sctp"
@ -1394,11 +1386,8 @@ bootstrapping purposes.")
"--disable-downloading" "--disable-downloading"
"--disable-tests" ;they are run in the check phase instead "--disable-tests" ;they are run in the check phase instead
"--with-openjdk-src-dir=./openjdk.src" "--with-openjdk-src-dir=./openjdk.src"
,(string-append "--with-javac=" jdk "/bin/javac") ,(string-append "--with-jdk-home="
,(string-append "--with-ecj-jar=" ecj) (assoc-ref %build-inputs "jdk")))
,(string-append "--with-gcj=" gcj)
,(string-append "--with-jdk-home=" jdk)
,(string-append "--with-java=" jdk "/bin/java")))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -1527,12 +1516,6 @@ bootstrapping purposes.")
#t)) #t))
(add-before 'configure 'set-additional-paths (add-before 'configure 'set-additional-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ( ;; Get target-specific include directory so that
;; libgcj-config.h is found when compiling hotspot.
(gcjinclude (let* ((port (open-input-pipe "gcj -print-file-name=include"))
(str (read-line port)))
(close-pipe port)
str)))
(substitute* "openjdk.src/jdk/make/common/shared/Sanity.gmk" (substitute* "openjdk.src/jdk/make/common/shared/Sanity.gmk"
(("ALSA_INCLUDE=/usr/include/alsa/version.h") (("ALSA_INCLUDE=/usr/include/alsa/version.h")
(string-append "ALSA_INCLUDE=" (string-append "ALSA_INCLUDE="
@ -1540,8 +1523,7 @@ bootstrapping purposes.")
"/include/alsa/version.h"))) "/include/alsa/version.h")))
(setenv "CC" "gcc") (setenv "CC" "gcc")
(setenv "CPATH" (setenv "CPATH"
(string-append gcjinclude ":" (string-append (assoc-ref inputs "libxcomposite")
(assoc-ref inputs "libxcomposite")
"/include/X11/extensions" ":" "/include/X11/extensions" ":"
(assoc-ref inputs "libxrender") (assoc-ref inputs "libxrender")
"/include/X11/extensions" ":" "/include/X11/extensions" ":"
@ -1559,7 +1541,7 @@ bootstrapping purposes.")
"/include")) "/include"))
(setenv "ALT_FREETYPE_LIB_PATH" (setenv "ALT_FREETYPE_LIB_PATH"
(string-append (assoc-ref inputs "freetype") (string-append (assoc-ref inputs "freetype")
"/lib"))) "/lib"))
#t)) #t))
(add-before 'check 'fix-test-framework (add-before 'check 'fix-test-framework
(lambda _ (lambda _
@ -1770,10 +1752,8 @@ bootstrapping purposes.")
("hotspot-drop" ("hotspot-drop"
,(drop "hotspot" ,(drop "hotspot"
"0q6mdgbbd3681y3n0z1v783irdjhhi73z6sn5csczpyhjm318axb")) "0q6mdgbbd3681y3n0z1v783irdjhhi73z6sn5csczpyhjm318axb"))
("ant" ,ant) ("ant" ,ant-bootstrap)
("attr" ,attr) ("attr" ,attr)
("autoconf" ,autoconf)
("automake" ,automake)
("coreutils" ,coreutils) ("coreutils" ,coreutils)
("diffutils" ,diffutils) ;for tests ("diffutils" ,diffutils) ;for tests
("gawk" ,gawk) ("gawk" ,gawk)
@ -1790,7 +1770,7 @@ bootstrapping purposes.")
("nss-certs" ,nss-certs) ("nss-certs" ,nss-certs)
("perl" ,perl) ("perl" ,perl)
("procps" ,procps) ;for "free", even though I'm not sure we should use it ("procps" ,procps) ;for "free", even though I'm not sure we should use it
("gcj" ,gcj))) ("jdk" ,icedtea-6 "jdk")))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("cups" ,cups) ("cups" ,cups)
@ -1939,7 +1919,7 @@ IcedTea build harness.")
,(drop "shenandoah" ,(drop "shenandoah"
"0fpxl8zlii1hpm777r875ys2cr5ih3gb6p1nm9jfa6krjrccrxv1")) "0fpxl8zlii1hpm777r875ys2cr5ih3gb6p1nm9jfa6krjrccrxv1"))
,@(fold alist-delete (package-native-inputs icedtea-7) ,@(fold alist-delete (package-native-inputs icedtea-7)
'("gcj" "openjdk-src" "corba-drop" "jaxp-drop" "jaxws-drop" '("jdk" "openjdk-src" "corba-drop" "jaxp-drop" "jaxws-drop"
"jdk-drop" "langtools-drop" "hotspot-drop"))))))) "jdk-drop" "langtools-drop" "hotspot-drop")))))))
(define-public icedtea icedtea-7) (define-public icedtea icedtea-7)