mirror of
https://github.com/xerial/snappy-java.git
synced 2025-07-23 05:54:41 +02:00
Merge pull request #213 from ossdev07/snappy-java
Failure of snappy-java 1.1.7 test cases due to isValidCompressedBuffer() on AARCH64
This commit is contained in:
commit
0215276a14
2
Makefile
2
Makefile
@ -106,8 +106,10 @@ $(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED)
|
|||||||
|
|
||||||
# aarch64 can use big-endian optimzied code
|
# aarch64 can use big-endian optimzied code
|
||||||
ifeq ($(OS_ARCH),aarch64)
|
ifeq ($(OS_ARCH),aarch64)
|
||||||
|
ifeq ($(ENDIANESS),$(BIG_ENDIAN))
|
||||||
SNAPPY_CXX_OPTS:=-DSNAPPY_IS_BIG_ENDIAN
|
SNAPPY_CXX_OPTS:=-DSNAPPY_IS_BIG_ENDIAN
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
$(SNAPPY_OUT)/%.o: $(SNAPPY_SRC_DIR)/%.cc
|
$(SNAPPY_OUT)/%.o: $(SNAPPY_SRC_DIR)/%.cc
|
||||||
@mkdir -p $(@D)
|
@mkdir -p $(@D)
|
||||||
|
@ -11,6 +11,8 @@ JAVA := "$$JAVA_HOME/bin/java"
|
|||||||
JAVAC := "$$JAVA_HOME/bin/javac"
|
JAVAC := "$$JAVA_HOME/bin/javac"
|
||||||
JAVAH := "$$JAVA_HOME/bin/javah"
|
JAVAH := "$$JAVA_HOME/bin/javah"
|
||||||
|
|
||||||
|
LITTLE_ENDIAN := "Little Endian"
|
||||||
|
BIG_ENDIAN := "Big Endian"
|
||||||
OSINFO_CLASS := org.xerial.snappy.OSInfo
|
OSINFO_CLASS := org.xerial.snappy.OSInfo
|
||||||
OSINFO_PROG := lib/org/xerial/snappy/OSInfo.class
|
OSINFO_PROG := lib/org/xerial/snappy/OSInfo.class
|
||||||
|
|
||||||
@ -24,6 +26,7 @@ OS_ARCH := $(shell $(JAVA) -cp lib $(OSINFO_CLASS) --arch)
|
|||||||
LIB_FOLDER := $(shell $(JAVA) -cp lib $(OSINFO_CLASS))
|
LIB_FOLDER := $(shell $(JAVA) -cp lib $(OSINFO_CLASS))
|
||||||
IBM_JDK_LIB := lib/inc_ibm
|
IBM_JDK_LIB := lib/inc_ibm
|
||||||
|
|
||||||
|
ENDIANESS=$(shell lscpu | grep "Byte Order" |cut -d ":" -f2)
|
||||||
# Windows uses different path separators
|
# Windows uses different path separators
|
||||||
ifeq ($(OS_NAME),Windows)
|
ifeq ($(OS_NAME),Windows)
|
||||||
sep := ;
|
sep := ;
|
||||||
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user