me
/
guix
Archived
1
0
Fork 0
Code

build-system/ant: Avoid usage of (guix build syscalls). 

* guix/build/ant-build-system.scm (strip-jar-timestamps): Use MKDTEMP from
Guile core rather than MKDTEMP!.
* guix/build/java-utils.scm (install-jar-file-with-pom): Likewise.
master
Marius Bakke 2022-11-03 20:45:32 +01:00
parent fa9ad4b482
commit a6343af221
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guix/build/ant-build-system.scm
View File

@ -19,7 +19,6 @@
(define-module (guix build ant-build-system)
#:use-module ((guix build gnu-build-system) #:prefix gnu:)
#:use-module (guix build syscalls)
#:use-module (guix build utils)
#:use-module (sxml simple)
#:use-module (ice-9 match)
@ -201,7 +200,7 @@ dependencies of this jar file."
repack them. This is necessary to ensure that archives are reproducible."
(define (repack-archive jar)
(format #t "repacking ~a\n" jar)
(let* ((dir (mkdtemp! "jar-contents.XXXXXX"))
(let* ((dir (mkdtemp "jar-contents.XXXXXX"))
(manifest (string-append dir "/META-INF/MANIFEST.MF")))
(with-directory-excursion dir
(invoke "jar" "xf" jar))

3
guix/build/java-utils.scm
View File

@ -21,7 +21,6 @@
(define-module (guix build java-utils)
#:use-module (guix build utils)
#:use-module (guix build syscalls)
#:use-module (guix build maven pom)
#:use-module (guix build maven plugin)
#:use-module (ice-9 match)
@ -83,7 +82,7 @@ fetched."
"Unpack the jar archive, add the pom file, and repack it. This is necessary
to ensure that maven can find dependencies."
(format #t "adding ~a to ~a\n" pom-file jar)
(let* ((dir (mkdtemp! "jar-contents.XXXXXX"))
(let* ((dir (mkdtemp "jar-contents.XXXXXX"))
(manifest (string-append dir "/META-INF/MANIFEST.MF"))
(pom (get-pom pom-file))
(artifact (pom-artifactid pom))