--- Makefile.orig 2020-05-06 17:26:51 UTC +++ Makefile @@ -2,7 +2,7 @@ include Makefile.common MVN:=mvn -SBT:=./sbt +SBT:=sbt -Dsbt.ivy.home=$(SBT_IVY_HOME) -Dsbt.offline=true -Dsbt.boot.directory=$(SBT_BOOT_DIR) -Dsbt.coursier=false -Dsbt.global.base=$(SBT_GLOBAL_DIR) all: snappy @@ -25,7 +25,6 @@ BITSHUFFLE_UNPACKED:=$(TARGET)/bitshuffle-extracted.lo $(BITSHUFFLE_ARCHIVE): @mkdir -p $(@D) - curl -L -o$@ https://github.com/kiyo-masui/bitshuffle/archive/$(BITSHUFFLE_VERSION).tar.gz $(BITSHUFFLE_UNPACKED): $(BITSHUFFLE_ARCHIVE) $(TAR) xvfz $< -C $(TARGET) @@ -65,26 +64,25 @@ endif $(SNAPPY_ARCHIVE): @mkdir -p $(@D) - curl -L -o$@ https://github.com/google/snappy/releases/download/$(SNAPPY_VERSION)/snappy-$(SNAPPY_VERSION).tar.gz $(SNAPPY_UNPACKED): $(SNAPPY_ARCHIVE) $(TAR) xvfz $< -C $(TARGET) touch $@ -$(SNAPPY_GIT_UNPACKED): - @mkdir -p $(SNAPPY_OUT) - rm -rf $(SNAPPY_SRC_DIR) - @mkdir -p $(SNAPPY_SRC_DIR) - git clone $(SNAPPY_GIT_REPO_URL) $(SNAPPY_SRC_DIR) - git --git-dir=$(SNAPPY_SRC_DIR)/.git --work-tree=$(SNAPPY_SRC_DIR) checkout -b local/snappy-$(SNAPPY_VERSION) $(SNAPPY_GIT_REV) - touch $@ +#$(SNAPPY_GIT_UNPACKED): +# @mkdir -p $(SNAPPY_OUT) +# rm -rf $(SNAPPY_SRC_DIR) +# @mkdir -p $(SNAPPY_SRC_DIR) +# git clone $(SNAPPY_GIT_REPO_URL) $(SNAPPY_SRC_DIR) +# git --git-dir=$(SNAPPY_SRC_DIR)/.git --work-tree=$(SNAPPY_SRC_DIR) checkout -b local/snappy-$(SNAPPY_VERSION) $(SNAPPY_GIT_REV) +# touch $@ -$(SNAPPY_CMAKE_CACHE): $(SNAPPY_GIT_UNPACKED) +$(SNAPPY_CMAKE_CACHE): $(SNAPPY_UNPACKED) @mkdir -p $(SNAPPY_OUT) cd $(SNAPPY_OUT) && cmake $(SNAPPY_CMAKE_OPTS) ../../$(SNAPPY_SRC_DIR) touch $@ -jni-header: $(SNAPPY_GIT_UNPACKED) $(BITSHUFFLE_UNPACKED) $(SRC)/org/xerial/snappy/SnappyNative.h $(SRC)/org/xerial/snappy/BitShuffleNative.h +jni-header: $(SNAPPY_UNPACKED) $(BITSHUFFLE_UNPACKED) $(SRC)/org/xerial/snappy/SnappyNative.h $(SRC)/org/xerial/snappy/BitShuffleNative.h snappy-header: $(SNAPPY_CMAKE_CACHE) @@ -100,7 +98,7 @@ $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNati $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class -$(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED) +$(SNAPPY_SRC): $(SNAPPY_UNPACKED) # aarch64 can use big-endian optimzied code ifeq ($(OS_ARCH),aarch64)