merged
This commit is contained in:
commit
e35d2fea1d
|
@ -41,7 +41,7 @@ endif
|
|||
|
||||
# os=Default is meant to be generic unix/linux
|
||||
|
||||
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 SunOS-x86 SunOS-sparc
|
||||
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 SunOS-x86 SunOS-sparc SunOS-x86_64
|
||||
os_arch := $(OS_NAME)-$(OS_ARCH)
|
||||
|
||||
ifeq (,$(findstring $(strip $(os_arch)),$(known_os_archs)))
|
||||
|
@ -86,6 +86,13 @@ SunOS-sparc_LINKFLAGS := -shared -static-libgcc -static-libstdc++
|
|||
SunOS-sparc_LIBNAME := libsnappyjava.so
|
||||
SunOS-sparc_SNAPPY_FLAGS :=
|
||||
|
||||
SunOS-x86_64_CXX := g++
|
||||
SunOS-x86_64_STRIP := strip
|
||||
SunOS-x86_64_CXXFLAGS := -include lib/inc_linux/jni_md.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64
|
||||
SunOS-x86_64_LINKFLAGS := -shared -static-libgcc -static-libstdc++
|
||||
SunOS-x86_64_LIBNAME := libsnappyjava.so
|
||||
SunOS-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
|
||||
# jni_md.h in same directory as jni.h, the include path is ignored when
|
||||
|
|
1
pom.xml
1
pom.xml
|
@ -190,6 +190,7 @@
|
|||
org/xerial/snappy/native/Linux/x86/libsnappyjava.so;osname=linux;processor=x86,
|
||||
org/xerial/snappy/native/SunOS/x86/libsnappyjava.so;osname=sunos;processor=x86,
|
||||
org/xerial/snappy/native/SunOS/sparc/libsnappyjava.so;osname=sunos;processor=sparc,
|
||||
org/xerial/snappy/native/SunOS/x86_64/libsnappyjava.so;osname=sunos;processor=x86-64,
|
||||
org/xerial/snappy/native/Linux/arm/libsnappyjava.so;osname=linux;processor=arm
|
||||
</Bundle-NativeCode>
|
||||
<!-- TODO: unsure about ARMHF -->
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue