nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: icedtea6: Replace "ant-bootstrap" with "ant". 

* gnu/packages/java.scm (icedtea6)[native-inputs]: Replace
  "ant-bootstrap" with "ant".
  [arguments]: Remove steps to unpack and use "ant-bootstrap".
  (icedtea7)[native-inputs]: Remove explicit references to
  "ant-bootstrap" and "ant".
This commit is contained in:
Ricardo Wurmus 2015-10-12 14:24:03 +02:00
parent 60eb5614d1
commit d4bf4c8f3e
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/packages/java.scm
View File

@ -276,10 +276,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
'unpack 'unpack
(lambda* (#:key source inputs #:allow-other-keys) (lambda* (#:key source inputs #:allow-other-keys)
(and (zero? (system* "tar" "xvf" source)) (and (zero? (system* "tar" "xvf" source))
(zero? (system* "tar" "xvjf"
(assoc-ref inputs "ant-bootstrap")))
(begin (begin
(patch-shebang "apache-ant-1.9.4/bin/ant")
(chdir (string-append ,name "-" ,version)) (chdir (string-append ,name "-" ,version))
(mkdir "openjdk") (mkdir "openjdk")
(with-directory-excursion "openjdk" (with-directory-excursion "openjdk"
@ -383,7 +380,6 @@ 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"))
;; Get target-specific include directory so that ;; Get target-specific include directory so that
;; libgcj-config.h is found when compiling hotspot. ;; libgcj-config.h is found when compiling hotspot.
(gcjinclude (let* ((port (open-input-pipe "gcj -print-file-name=include")) (gcjinclude (let* ((port (open-input-pipe "gcj -print-file-name=include"))
@ -407,9 +403,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
"/include")) "/include"))
(setenv "ALT_FREETYPE_LIB_PATH" (setenv "ALT_FREETYPE_LIB_PATH"
(string-append (assoc-ref %build-inputs "freetype") (string-append (assoc-ref %build-inputs "freetype")
"/lib")) "/lib"))))
(setenv "PATH" (string-append antpath "/bin:"
(getenv "PATH")))))
(alist-cons-before (alist-cons-before
'check 'fix-test-framework 'check 'fix-test-framework
(lambda _ (lambda _
@ -528,13 +522,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
(copy-recursively "openjdk.build/j2sdk-image" jdk))) (copy-recursively "openjdk.build/j2sdk-image" jdk)))
%standard-phases))))))))))) %standard-phases)))))))))))
(native-inputs (native-inputs
`(("ant-bootstrap" `(("ant" ,ant)
,(origin
(method url-fetch)
(uri "https://www.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.tar.bz2")
(sha256
(base32
"1kw801p8h5x4f0g8i5yknppssrj5a3xy1aqrkpfnk22bd1snbh90"))))
("alsa-lib" ,alsa-lib) ("alsa-lib" ,alsa-lib)
("attr" ,attr) ("attr" ,attr)
("autoconf" ,autoconf) ("autoconf" ,autoconf)
@ -738,8 +726,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
#t)) #t))
(delete 'patch-patches)))))) (delete 'patch-patches))))))
(native-inputs (native-inputs
`(("ant" ,ant) `(("openjdk-drop"
("openjdk-drop"
,(drop "openjdk" ,(drop "openjdk"
"0gs6vbj5c09516r460r68i7vm652sb25h973kq9hfx749qbs0s01")) "0gs6vbj5c09516r460r68i7vm652sb25h973kq9hfx749qbs0s01"))
("corba-drop" ("corba-drop"
@ -761,4 +748,4 @@ build process and its dependencies, whereas Make uses Makefile format.")
,(drop "hotspot" ,(drop "hotspot"
"1cv8df2s89mnjzg4rja4i89d4fr8n0c3v5y2cqbww1ma1463n100")) "1cv8df2s89mnjzg4rja4i89d4fr8n0c3v5y2cqbww1ma1463n100"))
,@(fold alist-delete (package-native-inputs icedtea6) ,@(fold alist-delete (package-native-inputs icedtea6)
'("openjdk6-src" "ant-bootstrap"))))))) '("openjdk6-src")))))))