From 9a7657ef46fca014a75d48b5b5c7bc43dc117fd5 Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Tue, 13 Aug 2013 17:45:03 +0900 Subject: [PATCH] Fix for Mac-x86 --- Makefile.common | 64 +++++++++--------- .../native/Mac/x86/libsnappyjava.jnilib | Bin 43716 -> 43804 bytes 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Makefile.common b/Makefile.common index 0e022c6..bb1d6f3 100755 --- a/Makefile.common +++ b/Makefile.common @@ -33,7 +33,7 @@ endif snappy := snappy-$(VERSION) -jni_md := $(shell find -L "$(JAVA_HOME)" -name jni_md.h) +jni_md := $(shell find -L "$(JAVA_HOME)" -name jni_md.h | head -1) ifneq ($(jni_md),) jni_include := $(shell dirname "$(jni_md)") endif @@ -41,7 +41,7 @@ endif # os=Default is meant to be generic unix/linux -known_os_archs := Linux-i386 Linux-amd64 Linux-arm Linux-armhf Mac-i386 Mac-x86_64 FreeBSD-amd64 Windows-x86 Windows-amd64 +known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armhf Mac-x86 Mac-x86_64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 os_arch := $(OS_NAME)-$(OS_ARCH) ifeq (,$(findstring $(strip $(os_arch)),$(known_os_archs))) @@ -58,19 +58,19 @@ Default_LINKFLAGS := -shared -static Default_LIBNAME := libsnappyjava.so Default_SNAPPY_FLAGS := -Linux-i386_CXX := $(CROSS_PREFIX)g++ -Linux-i386_STRIP := $(CROSS_PREFIX)strip -Linux-i386_CXXFLAGS := -include lib/inc_linux/jni_md.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32 -Linux-i386_LINKFLAGS := -shared -static-libgcc -static-libstdc++ -Linux-i386_LIBNAME := libsnappyjava.so -Linux-i386_SNAPPY_FLAGS:= +Linux-x86_CXX := $(CROSS_PREFIX)g++ +Linux-x86_STRIP := $(CROSS_PREFIX)strip +Linux-x86_CXXFLAGS := -include lib/inc_linux/jni_md.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32 +Linux-x86_LINKFLAGS := -shared -static-libgcc -static-libstdc++ +Linux-x86_LIBNAME := libsnappyjava.so +Linux-x86_SNAPPY_FLAGS:= -Linux-amd64_CXX := $(CROSS_PREFIX)g++ -Linux-amd64_STRIP := $(CROSS_PREFIX)strip -Linux-amd64_CXXFLAGS := -include lib/inc_linux/jni_md.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64 -Linux-amd64_LINKFLAGS := -shared -static-libgcc -static-libstdc++ -Linux-amd64_LIBNAME := libsnappyjava.so -Linux-amd64_SNAPPY_FLAGS := +Linux-x86_64_CXX := $(CROSS_PREFIX)g++ +Linux-x86_64_STRIP := $(CROSS_PREFIX)strip +Linux-x86_64_CXXFLAGS := -include lib/inc_linux/jni_md.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64 +Linux-x86_64_LINKFLAGS := -shared -static-libgcc -static-libstdc++ +Linux-x86_64_LIBNAME := libsnappyjava.so +Linux-x86_64_SNAPPY_FLAGS := # '-include lib/inc_linux/jni_md.h' is used to force the use of our version, # which defines JNIEXPORT differently; otherwise, since OpenJDK includes @@ -91,12 +91,12 @@ Linux-armhf_LINKFLAGS := -shared -static-libgcc Linux-armhf_LIBNAME := libsnappyjava.so Linux-armhf_SNAPPY_FLAGS:= -Mac-i386_CXX := g++ -arch $(OS_ARCH) -Mac-i386_STRIP := strip -x -Mac-i386_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden -Mac-i386_LINKFLAGS := -dynamiclib -static-libgcc -Mac-i386_LIBNAME := libsnappyjava.jnilib -Mac-i386_SNAPPY_FLAGS := +Mac-x86_CXX := g++ -arch i386 +Mac-x86_STRIP := strip -x +Mac-x86_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.4 -fvisibility=hidden +Mac-x86_LINKFLAGS := -dynamiclib -static-libgcc +Mac-x86_LIBNAME := libsnappyjava.jnilib +Mac-x86_SNAPPY_FLAGS := Mac-x86_64_CXX := g++ -arch $(OS_ARCH) Mac-x86_64_STRIP := strip -x @@ -105,12 +105,12 @@ Mac-x86_64_LINKFLAGS := -dynamiclib -static-libgcc Mac-x86_64_LIBNAME := libsnappyjava.jnilib Mac-x86_64_SNAPPY_FLAGS := -FreeBSD-amd64_CXX := $(CROSS_PREFIX)g++ -FreeBSD-amd64_STRIP := $(CROSS_PREFIX)strip -FreeBSD-amd64_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -FreeBSD-amd64_LINKFLAGS := -shared -static-libgcc -FreeBSD-amd64_LIBNAME := libsnappyjava.so -FreeBSD-amd64_SNAPPY_FLAGS := +FreeBSD-x86_64_CXX := $(CROSS_PREFIX)g++ +FreeBSD-x86_64_STRIP := $(CROSS_PREFIX)strip +FreeBSD-x86_64_CXXFLAGS := -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden +FreeBSD-x86_64_LINKFLAGS := -shared -static-libgcc +FreeBSD-x86_64_LIBNAME := libsnappyjava.so +FreeBSD-x86_64_SNAPPY_FLAGS := Windows-x86_CXX := $(CROSS_PREFIX)g++ Windows-x86_STRIP := $(CROSS_PREFIX)strip @@ -119,12 +119,12 @@ Windows-x86_LINKFLAGS := -Wl,--kill-at -shared -static Windows-x86_LIBNAME := snappyjava.dll Windows-x86_SNAPPY_FLAGS := -Windows-amd64_CXX := $(CROSS_PREFIX)g++ -Windows-amd64_STRIP := $(CROSS_PREFIX)strip -Windows-amd64_CXXFLAGS := -Ilib/inc_win -O2 -Windows-amd64_LINKFLAGS := -Wl,--kill-at -shared -static -Windows-amd64_LIBNAME := snappyjava.dll -Windows-amd64_SNAPPY_FLAGS := +Windows-x86_64_CXX := $(CROSS_PREFIX)g++ +Windows-x86_64_STRIP := $(CROSS_PREFIX)strip +Windows-x86_64_CXXFLAGS := -Ilib/inc_win -O2 +Windows-x86_64_LINKFLAGS := -Wl,--kill-at -shared -static +Windows-x86_64_LIBNAME := snappyjava.dll +Windows-x86_64_SNAPPY_FLAGS := CXX := $($(os_arch)_CXX) diff --git a/src/main/resources/org/xerial/snappy/native/Mac/x86/libsnappyjava.jnilib b/src/main/resources/org/xerial/snappy/native/Mac/x86/libsnappyjava.jnilib index 6df932df2a2f4221ca07e73ffa9baddb2132382c..9daa6e64283a105c2a692a9d9cae8f5492b50f00 100755 GIT binary patch delta 5143 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 Nw!^c;O@|&-{|~kEFOC2J delta 4676 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