rekado pushed a commit to branch master
in repository guix.
commit 6338ea9a88cb651a9796bdb2a62786d61acd5ad1
Author: Ricardo Wurmus <[email protected]>
Date: Tue Feb 27 20:48:49 2018 +0100
gnu: java-hawtjni: Simplify build phases.
* gnu/packages/java.scm (java-hawtjni)[arguments]: Use "invoke" instead of
"system*"; use "install-file" instead of "mkdir-p" and "copy-file".
---
gnu/packages/java.scm | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 830ecaf..579ab9b 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -8384,26 +8384,23 @@ including pre-existing objects that you do not have
source-code of.")
(modify-phases %standard-phases
(add-before 'build 'build-native
(lambda* (#:key inputs #:allow-other-keys)
- (with-directory-excursion "hawtjni-generator/src/main/resources/"
- (and
- (system* "gcc" "-c" "hawtjni.c" "-o" "hawtjni.o"
- "-fPIC" "-O2"
- (string-append "-I" (assoc-ref inputs "jdk")
"/include/linux"))
- (system* "gcc" "-c" "hawtjni-callback.c" "-o"
"hawtjni-callback.o"
- "-fPIC" "-O2"
- (string-append "-I" (assoc-ref inputs "jdk")
"/include/linux"))
- (system* "gcc" "-o" "libhawtjni.so" "-shared"
- "hawtjni.o" "hawtjni-callback.o")))))
+ (let ((include (string-append "-I" (assoc-ref inputs "jdk")
"/include/linux")))
+ (with-directory-excursion
"hawtjni-generator/src/main/resources/"
+ (invoke "gcc" "-c" "hawtjni.c" "-o" "hawtjni.o"
+ "-fPIC" "-O2" include)
+ (invoke "gcc" "-c" "hawtjni-callback.c" "-o"
"hawtjni-callback.o"
+ "-fPIC" "-O2" include)
+ (invoke "gcc" "-o" "libhawtjni.so" "-shared"
+ "hawtjni.o" "hawtjni-callback.o")))
+ #t))
(add-after 'install 'install-native
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib"))
(inc (string-append out "/include")))
- (mkdir-p lib)
- (mkdir-p inc)
(with-directory-excursion
"hawtjni-generator/src/main/resources/"
- (copy-file "libhawtjni.so" (string-append lib
"/libhawtjni.so"))
- (copy-file "hawtjni.h" (string-append inc "/hawtjni.h"))))
+ (install-file "libhawtjni.so" lib)
+ (install-file "hawtjni.h" inc)))
#t)))))
(inputs
`(("java-commons-cli" ,java-commons-cli)
