me/guix
Archived
1
0
Fork 0
Code Activity

gnu: java-snappy-1: Use invoke.

Browse source 
* gnu/packages/compression.scm (java-snappy-1)[arguments]: Use invoke.
This commit is contained in:
Mark H Weaver 2018-03-16 02:33:14 -04:00
parent 0a4d9eb770
commit 74d29bedc1
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/compression.scm
View file

@ -1173,7 +1173,7 @@ install: libbitshuffle.so
(add-before 'build 'build-jni (add-before 'build 'build-jni
(lambda _ (lambda _
;; Rebuild one of the binaries we removed earlier ;; Rebuild one of the binaries we removed earlier
(system* "javac" "src/main/java/org/xerial/snappy/OSInfo.java" (invoke "javac" "src/main/java/org/xerial/snappy/OSInfo.java"
"-d" "lib") "-d" "lib")
;; Link to the dynamic bitshuffle and snappy, not the static ones ;; Link to the dynamic bitshuffle and snappy, not the static ones
(substitute* "Makefile.common" (substitute* "Makefile.common"
@ -1260,7 +1260,7 @@ compresser/decompresser.")
(add-before 'build 'build-jni (add-before 'build 'build-jni
(lambda _ (lambda _
;; Rebuild one of the binaries we removed earlier ;; Rebuild one of the binaries we removed earlier
(system* "javac" "src/main/java/org/xerial/snappy/OSInfo.java" (invoke "javac" "src/main/java/org/xerial/snappy/OSInfo.java"
"-d" "lib") "-d" "lib")
;; Link to the dynamic snappy, not the static ones ;; Link to the dynamic snappy, not the static ones
(substitute* "Makefile.common" (substitute* "Makefile.common"
@ -1277,7 +1277,7 @@ compresser/decompresser.")
(("NAME\\): \\$\\(SNAPPY_OBJ\\)") (("NAME\\): \\$\\(SNAPPY_OBJ\\)")
"NAME): $(SNAPPY_OBJ)\n\t@mkdir -p $(@D)")) "NAME): $(SNAPPY_OBJ)\n\t@mkdir -p $(@D)"))
;; Finally we can run the Makefile to build the dynamic library. ;; Finally we can run the Makefile to build the dynamic library.
(zero? (system* "make" "native")))) (invoke "make" "native")))
;; Once we have built the shared library, we need to place it in the ;; Once we have built the shared library, we need to place it in the
;; "build" directory so it can be added to the jar file. ;; "build" directory so it can be added to the jar file.
(add-after 'build-jni 'copy-jni (add-after 'build-jni 'copy-jni