mirror of
https://github.com/xerial/snappy-java.git
synced 2025-07-06 13:44:29 +02:00
feature: Upgrade the internal snappy version to 1.1.10 (1.1.8 was wrongly used before) (#508)
* Upgrade to snappy 1.1.10 binary * Use a specific snappy version * Use cmake 3.16.x for mac-x86_64 * Add -ftemplate-depth for Mac x86_64 build
This commit is contained in:
parent
98b22256fe
commit
f2e97f27be
4
.github/workflows/build-native.yml
vendored
4
.github/workflows/build-native.yml
vendored
@ -30,6 +30,10 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
- name: Setup cmake
|
||||||
|
uses: jwlawson/actions-setup-cmake@v1.13
|
||||||
|
with:
|
||||||
|
cmake-version: '3.16.x'
|
||||||
- name: Build native libraries
|
- name: Build native libraries
|
||||||
run: make clean-native native-all
|
run: make clean-native native-all
|
||||||
env:
|
env:
|
||||||
|
4
Makefile
4
Makefile
@ -14,7 +14,8 @@ SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy-c.cc snappy.cc
|
|||||||
SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(SNAPPY_VERSION)
|
SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(SNAPPY_VERSION)
|
||||||
SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
|
SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC))
|
||||||
SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy
|
SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy
|
||||||
SNAPPY_GIT_REV:=537f4ad6240e586970fe554614542e9717df7902 # 1.1.8
|
# Change this variable to use a specific git commit
|
||||||
|
SNAPPY_GIT_REV:=$(SNAPPY_VERSION)
|
||||||
SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log
|
SNAPPY_UNPACKED:=$(TARGET)/snappy-extracted.log
|
||||||
SNAPPY_GIT_UNPACKED:=$(TARGET)/snappy-git-extracted.log
|
SNAPPY_GIT_UNPACKED:=$(TARGET)/snappy-git-extracted.log
|
||||||
SNAPPY_CMAKE_CACHE=$(SNAPPY_OUT)/CMakeCache.txt
|
SNAPPY_CMAKE_CACHE=$(SNAPPY_OUT)/CMakeCache.txt
|
||||||
@ -79,6 +80,7 @@ $(SNAPPY_GIT_UNPACKED):
|
|||||||
@mkdir -p $(SNAPPY_SRC_DIR)
|
@mkdir -p $(SNAPPY_SRC_DIR)
|
||||||
git clone $(SNAPPY_GIT_REPO_URL) $(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)
|
git --git-dir=$(SNAPPY_SRC_DIR)/.git --work-tree=$(SNAPPY_SRC_DIR) checkout -b local/snappy-$(SNAPPY_VERSION) $(SNAPPY_GIT_REV)
|
||||||
|
cd $(SNAPPY_SRC_DIR) && git submodule update --init
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
$(SNAPPY_CMAKE_CACHE): $(SNAPPY_GIT_UNPACKED)
|
$(SNAPPY_CMAKE_CACHE): $(SNAPPY_GIT_UNPACKED)
|
||||||
|
@ -258,7 +258,7 @@ Mac-x86_SNAPPY_FLAGS :=
|
|||||||
|
|
||||||
Mac-x86_64_CXX := c++ -arch $(OS_ARCH)
|
Mac-x86_64_CXX := c++ -arch $(OS_ARCH)
|
||||||
Mac-x86_64_STRIP := strip -x
|
Mac-x86_64_STRIP := strip -x
|
||||||
Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.7 -fvisibility=hidden -stdlib=libc++ -std=c++11
|
Mac-x86_64_CXXFLAGS := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.7 -fvisibility=hidden -stdlib=libc++ -std=c++11 -ftemplate-depth=1024
|
||||||
Mac-x86_64_LINKFLAGS := -dynamiclib
|
Mac-x86_64_LINKFLAGS := -dynamiclib
|
||||||
Mac-x86_64_LIBNAME := libsnappyjava.dylib
|
Mac-x86_64_LIBNAME := libsnappyjava.dylib
|
||||||
Mac-x86_64_SNAPPY_FLAGS :=
|
Mac-x86_64_SNAPPY_FLAGS :=
|
||||||
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user