Skip to content

Commit 6a89434

Browse files
committed
Upgrade bitshuffle to stable version
1 parent f9520f9 commit 6a89434

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

Makefile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ SNAPPY_GIT_REV:=2b9152d9c5bed71dffb7f7f6c7a3ec48b058ff2d # 1.1.3 with autogen.sh
1616
SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log
1717
SNAPPY_GIT_UNPACKED:=$(TARGET)/snappy-git-extracted.log
1818

19-
# TODO: Upgrade to a stable release
20-
BITSHUFFLE_VERSION:=55f9b4caec73fa21d13947cacea1295926781440
19+
BITSHUFFLE_VERSION:=0.2.2
2120
BITSHUFFLE_ARCHIVE:=$(TARGET)/bitshuffle-$(BITSHUFFLE_VERSION).tar.gz
2221
BITSHUFFLE_C:=bitshuffle_core.c iochain.c
2322
BITSHUFFLE_SRC_DIR:=$(TARGET)/bitshuffle-$(BITSHUFFLE_VERSION)/src
@@ -43,7 +42,7 @@ $(BITSHUFFLE_UNPACKED): $(BITSHUFFLE_ARCHIVE)
4342

4443
$(BITSHUFFLE_SRC): $(BITSHUFFLE_UNPACKED)
4544

46-
$(SNAPPY_OUT)/%.o : $(BITSHUFFLE_SRC_DIR)/%.c
45+
$(SNAPPY_OUT)/%.o: $(BITSHUFFLE_SRC_DIR)/%.c
4746
@mkdir -p $(@D)
4847
$(CXX) $(CXXFLAGS) -c $< -o $@
4948

@@ -81,15 +80,14 @@ $(SNAPPY_GIT_UNPACKED):
8180

8281
jni-header: $(SRC)/org/xerial/snappy/SnappyNative.h $(SRC)/org/xerial/snappy/BitShuffleNative.h
8382

84-
$(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class : $(SRC)/org/xerial/snappy/SnappyNative.java
83+
$(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class: $(SRC)/org/xerial/snappy/SnappyNative.java
8584
@mkdir -p $(TARGET)/jni-classes
8685
$(JAVAC) -source 1.6 -target 1.6 -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
8786

8887
$(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class
8988
$(JAVAH) -force -classpath $(TARGET)/jni-classes -o $@ org.xerial.snappy.SnappyNative
9089

91-
92-
$(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class : $(SRC)/org/xerial/snappy/BitShuffleNative.java
90+
$(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class: $(SRC)/org/xerial/snappy/BitShuffleNative.java
9391
@mkdir -p $(TARGET)/jni-classes
9492
$(JAVAC) -source 1.6 -target 1.6 -d $(TARGET)/jni-classes -sourcepath $(SRC) $<
9593

@@ -98,7 +96,7 @@ $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/sn
9896

9997
$(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED)
10098

101-
$(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc
99+
$(SNAPPY_OUT)/%.o: $(SNAPPY_SRC_DIR)/%.cc
102100
@mkdir -p $(@D)
103101
$(CXX) $(CXXFLAGS) -c $< -o $@
104102

Binary file not shown.

0 commit comments

Comments
 (0)