me
/
guix
Archived
1
0
Fork 0
Code

gnu: icedtea6: Add target-dependent include directory to CPATH. 

* gnu/packages/java.scm (gcj-4.8)[arguments]: Add target-dependent GCJ include
  directory to CPATH environment variable.
master
Ricardo Wurmus 2015-05-11 15:50:34 +02:00 committed by Ricardo Wurmus
parent 73b6cf429b
commit 4cbaf2ab65
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/java.scm
View File

@ -250,6 +250,11 @@ build process and its dependencies, whereas Make uses Makefile format.")
;; gremlin) doesn't support it yet, so skip this phase. ;; gremlin) doesn't support it yet, so skip this phase.
#:validate-runpath? #f #:validate-runpath? #f
#:modules ((guix build utils)
(guix build gnu-build-system)
(ice-9 popen)
(ice-9 rdelim))
#:configure-flags #:configure-flags
(let* ((gcjdir (assoc-ref %build-inputs "gcj")) (let* ((gcjdir (assoc-ref %build-inputs "gcj"))
(ecj (string-append gcjdir "/share/java/ecj.jar")) (ecj (string-append gcjdir "/share/java/ecj.jar"))
@ -378,9 +383,16 @@ build process and its dependencies, whereas Make uses Makefile format.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((gcjdir (assoc-ref %build-inputs "gcj")) (let* ((gcjdir (assoc-ref %build-inputs "gcj"))
(gcjlib (string-append gcjdir "/lib")) (gcjlib (string-append gcjdir "/lib"))
(antpath (string-append (getcwd) "/../apache-ant-1.9.4"))) (antpath (string-append (getcwd) "/../apache-ant-1.9.4"))
;; 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)))
(setenv "CPATH" (setenv "CPATH"
(string-append (assoc-ref %build-inputs "libxrender") (string-append gcjinclude ":"
(assoc-ref %build-inputs "libxrender")
"/include/X11/extensions" ":" "/include/X11/extensions" ":"
(assoc-ref %build-inputs "libxtst") (assoc-ref %build-inputs "libxtst")
"/include/X11/extensions" ":" "/include/X11/extensions" ":"