ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-27 14:52:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openjdk9: Simplify.

Browse source 
* gnu/packages/java.scm (openjdk9)[source]: Remove BEGIN.
[arguments]: Delete trailing #T from build phases.

Change-Id: If011dc595c1b9b0d79fd5bb727a8680d1ad4d100
This commit is contained in:
Ricardo Wurmus 2024-01-10 21:54:16 +01:00
parent db7488a7fb
commit cf11f07588
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/java.scm
View file

@ -873,9 +873,8 @@ (define-public openjdk9
(changeset "jdk-9+181"))) (changeset "jdk-9+181")))
(file-name (hg-file-name name version)) (file-name (hg-file-name name version))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet `(begin (snippet '(for-each delete-file
(for-each delete-file (find-files "." ".*.(bin|exe|jar)$")))
(find-files "." ".*.(bin|exe|jar)$"))))
(sha256 (sha256
(base32 (base32
"1v92nzdqx07c35x945awzir4yk0fk22vky6fpp8mq9js930sxsz0")) "1v92nzdqx07c35x945awzir4yk0fk22vky6fpp8mq9js930sxsz0"))
@ -916,8 +915,7 @@ (define-public openjdk9
;; This file was "fixed" by patch-source-shebangs, but it requires ;; This file was "fixed" by patch-source-shebangs, but it requires
;; this exact first line. ;; this exact first line.
(substitute* "jdk/make/data/blacklistedcertsconverter/blacklisted.certs.pem" (substitute* "jdk/make/data/blacklistedcertsconverter/blacklisted.certs.pem"
(("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n")) (("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n"))))
#t))
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; TODO: unbundle libpng and lcms ;; TODO: unbundle libpng and lcms
@ -933,14 +931,12 @@ (define-public openjdk9
"--disable-hotspot-gtest" "--disable-hotspot-gtest"
"--with-giflib=system" "--with-giflib=system"
"--with-libjpeg=system" "--with-libjpeg=system"
(string-append "--prefix=" (assoc-ref outputs "out"))) (string-append "--prefix=" (assoc-ref outputs "out")))))
#t))
(add-before 'build 'write-source-revision-file (add-before 'build 'write-source-revision-file
(lambda _ (lambda _
(with-output-to-file ".src-rev" (with-output-to-file ".src-rev"
(lambda _ (lambda _
(display ,version))) (display ,version)))))
#t))
(replace 'build (replace 'build
(lambda* (#:key make-flags parallel-build? #:allow-other-keys) (lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(apply invoke "make" (apply invoke "make"
@ -983,8 +979,7 @@ (define (icedtea-or-openjdk? path)
"warning: failed to substitute: ~a~%" "warning: failed to substitute: ~a~%"
file)))) file))))
(find-files "." (find-files "."
"\\.c$|\\.h$")) "\\.c$|\\.h$")))))
#t)))
;; By default OpenJDK only generates an empty keystore. In order to ;; By default OpenJDK only generates an empty keystore. In order to
;; be able to use certificates in Java programs we need to generate a ;; be able to use certificates in Java programs we need to generate a
;; keystore from a set of certificates. For convenience we use the ;; keystore from a set of certificates. For convenience we use the
@ -1078,8 +1073,7 @@ (define (import-cert cert)
(symlink (string-append lib-jdk "/server/libjvm.so") (symlink (string-append lib-jdk "/server/libjvm.so")
(string-append lib-jdk "/libjvm.so")) (string-append lib-jdk "/libjvm.so"))
(symlink (string-append lib-out "/server/libjvm.so") (symlink (string-append lib-out "/server/libjvm.so")
(string-append lib-out "/libjvm.so"))) (string-append lib-out "/libjvm.so")))))
#t))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
@ -1089,8 +1083,7 @@ (define (import-cert cert)
#:directories? #t)))) #:directories? #t))))
(copy-recursively (string-append images "/images/jdk") jdk) (copy-recursively (string-append images "/images/jdk") jdk)
(copy-recursively (string-append images "/images/jre") out) (copy-recursively (string-append images "/images/jre") out)
(copy-recursively (string-append images "/images/docs") doc)) (copy-recursively (string-append images "/images/docs") doc))))
#t))
(add-after 'install 'strip-zip-timestamps (add-after 'install 'strip-zip-timestamps
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(for-each (lambda (zip) (for-each (lambda (zip)
@ -1107,8 +1100,7 @@ (define (import-cert cert)
(with-directory-excursion dir (with-directory-excursion dir
(let ((files (find-files "." ".*" #:directories? #t))) (let ((files (find-files "." ".*" #:directories? #t)))
(apply invoke "zip" "-0" "-X" zip files))))) (apply invoke "zip" "-0" "-X" zip files)))))
(find-files (assoc-ref outputs "doc") ".*.zip$")) (find-files (assoc-ref outputs "doc") ".*.zip$")))))))
#t)))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("cups" ,cups) ("cups" ,cups)