4 files changed, 97 insertions, 13 deletions
diff --git a/archivers/snappy-java/files/patch-Makefile b/archivers/snappy-java/files/patch-Makefile
new file mode 100644
index 000000000000..95da58e79b2e
--- /dev/null
+++ b/archivers/snappy-java/files/patch-Makefile
@@ -0,0 +1,64 @@
+--- 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)
diff --git a/archivers/snappy-java/files/patch-Makefile.common b/archivers/snappy-java/files/patch-Makefile.common
new file mode 100644
index 000000000000..4cd84627f913
--- /dev/null
+++ b/archivers/snappy-java/files/patch-Makefile.common
@@ -0,0 +1,25 @@
+--- Makefile.common.orig	2020-05-14 10:44:28 UTC
++++ Makefile.common
+@@ -45,7 +45,7 @@ endif
+ 
+ # os=Default is meant to be generic unix/linux
+ 
+-known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64
++known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-aarch64 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x Mac-x86 Mac-x86_64 FreeBSD-x86 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64
+ os_arch := $(OS_NAME)-$(OS_ARCH)
+ IBM_JDK_7 := $(findstring IBM, $(shell $(JAVA) -version 2>&1 | grep IBM | grep "JRE 1.7"))
+ 
+@@ -249,6 +249,13 @@ Mac-x86_64_CXXFLAGS  := -Ilib/inc_mac -I$(JAVA_HOME)/i
+ Mac-x86_64_LINKFLAGS := -dynamiclib
+ Mac-x86_64_LIBNAME   := libsnappyjava.jnilib
+ Mac-x86_64_SNAPPY_FLAGS  :=
++
++FreeBSD-x86_CXX          := $(CROSS_PREFIX)g++
++FreeBSD-x86_STRIP        := $(CROSS_PREFIX)strip
++FreeBSD-x86_CXXFLAGS     := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
++FreeBSD-x86_LINKFLAGS    := -shared -static-libgcc
++FreeBSD-x86_LIBNAME      := libsnappyjava.so
++FreeBSD-x86_SNAPPY_FLAGS :=
+ 
+ FreeBSD-x86_64_CXX          := $(CROSS_PREFIX)g++
+ FreeBSD-x86_64_STRIP        := $(CROSS_PREFIX)strip
diff --git a/archivers/snappy-java/files/patch-likelinux b/archivers/snappy-java/files/patch-likelinux
deleted file mode 100644
index 8c674a37d205..000000000000
--- a/archivers/snappy-java/files/patch-likelinux
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.common.orig	2011-10-05 01:29:42 UTC
-+++ Makefile.common
-@@ -50,8 +50,8 @@ endif
- 
- Default_CXX          := g++
- Default_STRIP        := strip
--Default_CXXFLAGS     := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
--Default_LINKFLAGS    := -shared -static
-+Default_CXXFLAGS     := -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
-+Default_LINKFLAGS    := -lc -shared
- Default_LIBNAME      := libsnappyjava.so
- Default_SNAPPY_FLAGS := 
- 
diff --git a/archivers/snappy-java/files/patch-project_plugins.sbt b/archivers/snappy-java/files/patch-project_plugins.sbt
new file mode 100644
index 000000000000..f514c0b0c73b
--- /dev/null
+++ b/archivers/snappy-java/files/patch-project_plugins.sbt
@@ -0,0 +1,8 @@
+--- project/plugins.sbt.orig	2020-05-09 18:44:59 UTC
++++ project/plugins.sbt
+@@ -4,5 +4,4 @@ addSbtPlugin("com.jsuereth"      % "sbt-pgp"      % "2
+ addSbtPlugin("com.github.sbt"    % "sbt-findbugs" % "2.0.0")
+ addSbtPlugin("com.github.sbt"    % "sbt-jacoco"   % "3.1.0")
+ addSbtPlugin("com.typesafe.sbt"  % "sbt-osgi"     % "0.9.4")
+-addSbtPlugin("io.get-coursier"   % "sbt-coursier" % "1.1.0-M7")
+ addSbtPlugin("com.geirsson"      % "sbt-scalafmt" % "1.5.1")