diff --git a/Makefile b/Makefile index 263ecc5..20f491e 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(SNAPPY_VERSION) SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC)) SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy -SNAPPY_GIT_REV:=32d6d7d8a2ef328a2ee1dd40f072e21f4983ebda # 1.1.3 May 23, 2016 +SNAPPY_GIT_REV:=2d99bd14d471664758e4dfdf81b44f413a7353fd # 1.1.4 SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log SNAPPY_GIT_UNPACKED:=$(TARGET)/snappy-git-extracted.log SNAPPY_SOURCE_CONFIGURED:=$(TARGET)/snappy-configure.log diff --git a/Makefile.common b/Makefile.common index 6590728..949b7ef 100755 --- a/Makefile.common +++ b/Makefile.common @@ -75,9 +75,9 @@ Default_SNAPPY_FLAGS := Linux-x86_CXX := $(CROSS_PREFIX)g++ Linux-x86_STRIP := $(CROSS_PREFIX)strip ifeq ($(IBM_JDK_7),) - Linux-x86_CXXFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32 + Linux-x86_CXXFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32 -U__SSE2__ else - Linux-x86_CXXFLAGS := -include $(IBM_JDK_LIB)/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32 + Linux-x86_CXXFLAGS := -include $(IBM_JDK_LIB)/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32 -U__SSE2__ endif Linux-x86_LINKFLAGS := -shared -static-libgcc -static-libstdc++ Linux-x86_LIBNAME := libsnappyjava.so diff --git a/src/main/resources/org/xerial/snappy/VERSION b/src/main/resources/org/xerial/snappy/VERSION index e9a5db2..55215d4 100755 --- a/src/main/resources/org/xerial/snappy/VERSION +++ b/src/main/resources/org/xerial/snappy/VERSION @@ -1,2 +1,2 @@ -SNAPPY_VERSION=1.1.3 +SNAPPY_VERSION=1.1.4 BITSHUFFLE_VERSION=0.2.2 diff --git a/src/main/resources/org/xerial/snappy/native/Linux/aarch64/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/aarch64/libsnappyjava.so index 7e407c1..113699c 100755 Binary files a/src/main/resources/org/xerial/snappy/native/Linux/aarch64/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/aarch64/libsnappyjava.so differ diff --git a/src/main/resources/org/xerial/snappy/native/Linux/android-arm/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/android-arm/libsnappyjava.so index 2f98330..70fce11 100755 Binary files a/src/main/resources/org/xerial/snappy/native/Linux/android-arm/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/android-arm/libsnappyjava.so differ diff --git a/src/main/resources/org/xerial/snappy/native/Linux/arm/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/arm/libsnappyjava.so index b51d4f4..affbf26 100755 Binary files a/src/main/resources/org/xerial/snappy/native/Linux/arm/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/arm/libsnappyjava.so differ diff --git a/src/main/resources/org/xerial/snappy/native/Linux/armv6/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/armv6/libsnappyjava.so index aa948f0..9cda5bd 100755 Binary files a/src/main/resources/org/xerial/snappy/native/Linux/armv6/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/armv6/libsnappyjava.so differ diff --git a/src/main/resources/org/xerial/snappy/native/Linux/armv7/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/armv7/libsnappyjava.so index 58a0fb7..8b426dc 100755 Binary files a/src/main/resources/org/xerial/snappy/native/Linux/armv7/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/armv7/libsnappyjava.so differ diff --git a/src/main/resources/org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so index 0e65936..9010db2 100755 Binary files a/src/main/resources/org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so differ diff --git a/src/main/resources/org/xerial/snappy/native/Linux/x86/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/x86/libsnappyjava.so index 9b1c282..6bc5be0 100755 Binary files a/src/main/resources/org/xerial/snappy/native/Linux/x86/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/x86/libsnappyjava.so differ diff --git a/src/main/resources/org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so b/src/main/resources/org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so index c2253b6..82f91bc 100755 Binary files a/src/main/resources/org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so and b/src/main/resources/org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so differ diff --git a/src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib b/src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib index fa6f1fe..9cafaa5 100755 Binary files a/src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib and b/src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib differ diff --git a/src/main/resources/org/xerial/snappy/native/Windows/x86/snappyjava.dll b/src/main/resources/org/xerial/snappy/native/Windows/x86/snappyjava.dll index fca5747..c5978c8 100755 Binary files a/src/main/resources/org/xerial/snappy/native/Windows/x86/snappyjava.dll and b/src/main/resources/org/xerial/snappy/native/Windows/x86/snappyjava.dll differ diff --git a/src/main/resources/org/xerial/snappy/native/Windows/x86_64/snappyjava.dll b/src/main/resources/org/xerial/snappy/native/Windows/x86_64/snappyjava.dll index c496a6e..fa7d305 100755 Binary files a/src/main/resources/org/xerial/snappy/native/Windows/x86_64/snappyjava.dll and b/src/main/resources/org/xerial/snappy/native/Windows/x86_64/snappyjava.dll differ diff --git a/version.sbt b/version.sbt index 76dcbae..918f99a 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "1.1.3-SNAPSHOT" +version in ThisBuild := "1.1.4-SNAPSHOT"