amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: OpenJDK: Avoid usage of (guix build syscalls).

Browse source 
* gnu/packages/java.scm (ant-bootstrap)[arguments]: Use MKDTEMP instead of
MKDTEMP! from (guix build syscalls).
(icedtea-8, openjdk9, openjdk11, antlr2): Likewise.
This commit is contained in:
Marius Bakke 2022-11-03 20:46:52 +01:00
parent a6343af221
commit d899e9351d
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/java.scm
View file

@ -252,12 +252,9 @@ JNI.")
"1cg0lga887qz5iizh6mlkxp01lciymrhmp7wzxpl6zpnldxmzrjx")))) "1cg0lga887qz5iizh6mlkxp01lciymrhmp7wzxpl6zpnldxmzrjx"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:imported-modules ((guix build syscalls) `(#:modules ((srfi srfi-1)
,@%gnu-build-system-modules)
#:modules ((srfi srfi-1)
(guix build gnu-build-system) (guix build gnu-build-system)
(guix build utils) (guix build utils))
(guix build syscalls))
#:tests? #f ; no "check" target #:tests? #f ; no "check" target
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -302,7 +299,7 @@ JNI.")
(add-after 'build 'strip-jar-timestamps ;based on ant-build-system (add-after 'build 'strip-jar-timestamps ;based on ant-build-system
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(define (repack-archive jar) (define (repack-archive jar)
(let* ((dir (mkdtemp! "jar-contents.XXXXXX")) (let* ((dir (mkdtemp "jar-contents.XXXXXX"))
(manifest (string-append dir "/META-INF/MANIFESTS.MF"))) (manifest (string-append dir "/META-INF/MANIFESTS.MF")))
(with-directory-excursion dir (with-directory-excursion dir
(invoke "unzip" jar)) (invoke "unzip" jar))
@ -1375,7 +1372,6 @@ IcedTea build harness.")
(arguments (arguments
`(#:imported-modules `(#:imported-modules
((guix build ant-build-system) ((guix build ant-build-system)
(guix build syscalls)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:disallowed-references ,(list (gexp-input icedtea-7 "jdk")) #:disallowed-references ,(list (gexp-input icedtea-7 "jdk"))
@ -1538,10 +1534,6 @@ new Date();"))
(arguments (arguments
`(#:tests? #f; require jtreg `(#:tests? #f; require jtreg
#:make-flags '("all") #:make-flags '("all")
#:imported-modules
((guix build syscalls)
,@%gnu-build-system-modules)
#:disallowed-references ,(list (gexp-input icedtea-8) #:disallowed-references ,(list (gexp-input icedtea-8)
(gexp-input icedtea-8 "jdk")) (gexp-input icedtea-8 "jdk"))
@ -1655,9 +1647,8 @@ new Date();"))
#t)) #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)
(use-modules (guix build syscalls))
(for-each (lambda (zip) (for-each (lambda (zip)
(let ((dir (mkdtemp! "zip-contents.XXXXXX"))) (let ((dir (mkdtemp "zip-contents.XXXXXX")))
(with-directory-excursion dir (with-directory-excursion dir
(invoke "unzip" zip)) (invoke "unzip" zip))
(delete-file zip) (delete-file zip)
@ -1786,8 +1777,6 @@ new Date();"))
(outputs '("out" "jdk" "doc")) (outputs '("out" "jdk" "doc"))
(arguments (arguments
(list (list
#:imported-modules `((guix build syscalls)
,@%gnu-build-system-modules)
#:modules `((guix build gnu-build-system) #:modules `((guix build gnu-build-system)
(guix build utils) (guix build utils)
(ice-9 match) (ice-9 match)
@ -1918,9 +1907,8 @@ new Date();"))
(string-append lib-out "/libjvm.so"))))) (string-append lib-out "/libjvm.so")))))
(add-after 'install 'strip-character-data-timestamps (add-after 'install 'strip-character-data-timestamps
(lambda _ (lambda _
(use-modules (guix build syscalls))
(let ((archive (string-append #$output:jdk "/lib/src.zip")) (let ((archive (string-append #$output:jdk "/lib/src.zip"))
(dir (mkdtemp! "zip-contents.XXXXXX"))) (dir (mkdtemp "zip-contents.XXXXXX")))
(with-directory-excursion dir (with-directory-excursion dir
(invoke "unzip" archive)) (invoke "unzip" archive))
(delete-file archive) (delete-file archive)
@ -1952,12 +1940,11 @@ new Date();"))
outputs))))) outputs)))))
(add-after 'remove-diz-file 'strip-archive-timestamps (add-after 'remove-diz-file 'strip-archive-timestamps
(lambda _ (lambda _
(use-modules (guix build syscalls) (use-modules (ice-9 binary-ports)
(ice-9 binary-ports)
(rnrs bytevectors)) (rnrs bytevectors))
(letrec ((repack-archive (letrec ((repack-archive
(lambda (archive) (lambda (archive)
(let ((dir (mkdtemp! "zip-contents.XXXXXX"))) (let ((dir (mkdtemp "zip-contents.XXXXXX")))
(with-directory-excursion dir (with-directory-excursion dir
(invoke "unzip" archive)) (invoke "unzip" archive))
(delete-file archive) (delete-file archive)
@ -8171,7 +8158,6 @@ discards all logging messages.")
(arguments (arguments
`(#:tests? #f ; no test target `(#:tests? #f ; no test target
#:imported-modules ((guix build ant-build-system) #:imported-modules ((guix build ant-build-system)
(guix build syscalls)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:modules (((guix build ant-build-system) #:prefix ant:) #:modules (((guix build ant-build-system) #:prefix ant:)
(guix build gnu-build-system) (guix build gnu-build-system)