[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/08: gnu: java-snappy: Update to 1.1.7.
From: |
Marius Bakke |
Subject: |
03/08: gnu: java-snappy: Update to 1.1.7. |
Date: |
Sun, 4 Mar 2018 11:57:04 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 8293d21c660a8c210a0fb3fd431e3dc7053f2326
Author: Marius Bakke <address@hidden>
Date: Wed Feb 21 04:26:29 2018 +0100
gnu: java-snappy: Update to 1.1.7.
* gnu/packages/compression.scm (java-snappy): Update to 1.1.7.
[arguments]: Use INVOKE instead of SYSTEM*. Avoid CMAKE dependency. Delete
Hadoop test. Enable fixed test.
[native-inputs]: Add JAVA-COMMONS-LANG and JAVA-COMMONS-IO.
---
gnu/packages/compression.scm | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index f55f0c2..423d398 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1133,7 +1133,7 @@ install: libbitshuffle.so
(define-public java-snappy
(package
(name "java-snappy")
- (version "1.1.4")
+ (version "1.1.7")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/xerial/snappy-java/archive/"
@@ -1141,7 +1141,7 @@ install: libbitshuffle.so
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1w58diryma7qz7aa24yv8shf3flxcbbw8jgcn2lih14wgmww58ww"))))
+ "0q4kxz2n97czf6g5gzq0d8yz22cgiaj7wp51rzsswh3bi99bpgg5"))))
(build-system ant-build-system)
(arguments
`(#:jar-name "snappy.jar"
@@ -1181,7 +1181,9 @@ install: libbitshuffle.so
(("NAME\\): \\$\\(SNAPPY_OBJ\\)")
"NAME): $(SNAPPY_OBJ)address@hidden -p $(@D)"))
;; Finally we can run the Makefile to build the dynamic library.
- (zero? (system* "make" "native"))))
+ ;; Use the -nocmake target to avoid a dependency on cmake,
+ ;; which in turn requires the "git_unpacked" directory.
+ (invoke "make" "native-nocmake")))
;; 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.
(add-after 'build-jni 'copy-jni
@@ -1190,13 +1192,14 @@ install: libbitshuffle.so
"build/classes/org/xerial/snappy/native")))
(add-before 'check 'fix-failing
(lambda _
- ;; This package assumes maven build, which puts results in
"target".
- ;; We put them in "build" instead, so fix that.
- (substitute*
"src/test/java/org/xerial/snappy/SnappyLoaderTest.java"
- (("target/classes") "build/classes"))
- ;; FIXME: probably an error
- (substitute*
"src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java"
- (("91080") "91013")))))))
+ (with-directory-excursion "src/test/java/org/xerial/snappy"
+ ;; This package assumes maven build, which puts results in
"target".
+ ;; We put them in "build" instead, so fix that.
+ (substitute* "SnappyLoaderTest.java"
+ (("target/classes") "build/classes"))
+ ;; This requires Hadoop, which is not in Guix yet.
+ (delete-file "SnappyHadoopCompatibleOutputStreamTest.java"))
+ #t)))))
(inputs
`(("osgi-framework" ,java-osgi-framework)))
(propagated-inputs
@@ -1207,6 +1210,8 @@ install: libbitshuffle.so
("hamcrest" ,java-hamcrest-core)
("xerial-core" ,java-xerial-core)
("classworlds" ,java-plexus-classworlds)
+ ("commons-lang" ,java-commons-lang)
+ ("commons-io" ,java-commons-io)
("perl" ,perl)))
(home-page "https://github.com/xerial/snappy-java")
(synopsis "Compression/decompression algorithm in Java")
- branch master updated (81ed306 -> 3e57b7d), Marius Bakke, 2018/03/04
- 02/08: gnu: snappy: Update to 1.1.7., Marius Bakke, 2018/03/04
- 04/08: gnu: Add address@hidden, Marius Bakke, 2018/03/04
- 08/08: gnu: multipath-tools: Update to 0.7.4., Marius Bakke, 2018/03/04
- 07/08: gnu: freexl: Update to 1.0.5 [security fixes]., Marius Bakke, 2018/03/04
- 03/08: gnu: java-snappy: Update to 1.1.7.,
Marius Bakke <=
- 01/08: gnu: rocksdb: Update to 5.10.4., Marius Bakke, 2018/03/04
- 05/08: gnu: Add address@hidden, Marius Bakke, 2018/03/04
- 06/08: gnu: ceph: Update to 12.2.4., Marius Bakke, 2018/03/04