[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/18: gnu: java-jansi-native: Simplify.
From: |
Ricardo Wurmus |
Subject: |
11/18: gnu: java-jansi-native: Simplify. |
Date: |
Wed, 28 Feb 2018 17:05:22 -0500 (EST) |
rekado pushed a commit to branch master
in repository guix.
commit e85c1bf6cd72887eb20680ac8ebf578b5831e6f6
Author: Ricardo Wurmus <address@hidden>
Date: Tue Feb 27 20:53:15 2018 +0100
gnu: java-jansi-native: Simplify.
* gnu/packages/java.scm (java-jansi-native)[arguments]: Use "invoke"; remove
useless "mkdir-p".
---
gnu/packages/java.scm | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 1c84358..3c208ff 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -8437,14 +8437,14 @@ that is part of the SWT Tools project.")
(with-directory-excursion "src/main/native-package/src"
(substitute* "jansi_ttyname.c"
(("#include \"jansi_.*") ""))
- (and
- (system* "gcc" "-c" "jansi_ttyname.c" "-o" "jansi_ttyname.o"
- (string-append "-I" (assoc-ref inputs "java-hawtjni")
- "/include")
- (string-append "-I" (assoc-ref inputs "jdk")
- "/include/linux")
- "-fPIC" "-O2")
- (system* "gcc" "-o" "libjansi.so" "-shared"
"jansi_ttyname.o")))))
+ (invoke "gcc" "-c" "jansi_ttyname.c" "-o" "jansi_ttyname.o"
+ (string-append "-I" (assoc-ref inputs "java-hawtjni")
+ "/include")
+ (string-append "-I" (assoc-ref inputs "jdk")
+ "/include/linux")
+ "-fPIC" "-O2")
+ (invoke "gcc" "-o" "libjansi.so" "-shared" "jansi_ttyname.o")
+ #t)))
(add-before 'build 'install-native
(lambda _
(let ((dir (string-append "build/classes/META-INF/native/"
@@ -8457,7 +8457,6 @@ that is part of the SWT Tools project.")
#t))
(add-after 'install 'install-native
(lambda* (#:key outputs #:allow-other-keys)
- (mkdir-p (string-append (assoc-ref outputs "out") "/include"))
(install-file "src/main/native-package/src/jansi.h"
(string-append (assoc-ref outputs "out")
"/include"))
#t)))))
- 04/18: gnu: java-jnacl: Correct license., (continued)
- 04/18: gnu: java-jnacl: Correct license., Ricardo Wurmus, 2018/02/28
- 02/18: gnu: Add java-ecj-3.5., Ricardo Wurmus, 2018/02/28
- 03/18: gnu: java-jnacl: Use invoke., Ricardo Wurmus, 2018/02/28
- 05/18: gnu: java-jnacl: Simplify build phase., Ricardo Wurmus, 2018/02/28
- 07/18: gnu: java-jnacl: Do not prefix jar with "java-"., Ricardo Wurmus, 2018/02/28
- 06/18: gnu: java-jnacl: Update to 0.1.0-2.094e819., Ricardo Wurmus, 2018/02/28
- 15/18: gnu: java-bouncycastle-bcprov: Use invoke., Ricardo Wurmus, 2018/02/28
- 08/18: gnu: java-commons-jexl-2: Use invoke., Ricardo Wurmus, 2018/02/28
- 09/18: gnu: java-hawtjni: Simplify build phases., Ricardo Wurmus, 2018/02/28
- 10/18: gnu: java-jansi-native: Fix description., Ricardo Wurmus, 2018/02/28
- 11/18: gnu: java-jansi-native: Simplify.,
Ricardo Wurmus <=
- 12/18: gnu: antlr3-3.1: Use invoke., Ricardo Wurmus, 2018/02/28
- 13/18: gnu: antlr3-3.1: Remove version from package name., Ricardo Wurmus, 2018/02/28
- 14/18: gnu: java-lz4: Use invoke., Ricardo Wurmus, 2018/02/28
- 17/18: gnu: Remove emacs-nov., Ricardo Wurmus, 2018/02/28
- 18/18: gnu: Remove duplicate definition of emacs-esxml., Ricardo Wurmus, 2018/02/28
- 16/18: gnu: java-bouncycastle-bcpkix: Use invoke., Ricardo Wurmus, 2018/02/28