File tree Expand file tree Collapse file tree 4 files changed +12
-11
lines changed
src/main/resources/org/xerial/snappy/native/Linux Expand file tree Collapse file tree 4 files changed +12
-11
lines changed Original file line number Diff line number Diff line change @@ -141,6 +141,7 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
141
141
snappy-jar-version: =snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.* ) \"/\1/" version.sbt | sed -e "/^$$/d")
142
142
143
143
native : jni-header snappy-header $(NATIVE_DLL )
144
+ native-nocmake : jni-header $(NATIVE_DLL )
144
145
snappy : native $(TARGET ) /$(snappy-jar-version ) .jar
145
146
146
147
native-all : win32 win64 mac64 native-arm linux32 linux64 linux-ppc64le linux-aarch64
@@ -175,10 +176,10 @@ mac64: jni-header
175
176
docker run -it $(DOCKER_RUN_OPTS ) -v $$ PWD:/workdir -e CROSS_TRIPLE=x86_64-apple-darwin multiarch/crossbuild make clean-native native OS_NAME=Mac OS_ARCH=x86_64
176
177
177
178
linux32 : jni-header
178
- docker run $(DOCKER_RUN_OPTS ) -ti -v $$ PWD:/work xerial/centos5-linux-x86_64-pic bash -c ' make clean-native native OS_NAME=Linux OS_ARCH=x86'
179
+ docker run $(DOCKER_RUN_OPTS ) -ti -v $$ PWD:/work xerial/centos5-linux-x86_64-pic bash -c ' make clean-native native-nocmake OS_NAME=Linux OS_ARCH=x86'
179
180
180
181
linux64 : jni-header
181
- docker run $(DOCKER_RUN_OPTS ) -ti -v $$ PWD:/work xerial/centos5-linux-x86_64-pic bash -c ' make clean-native native OS_NAME=Linux OS_ARCH=x86_64'
182
+ docker run $(DOCKER_RUN_OPTS ) -ti -v $$ PWD:/work xerial/centos5-linux-x86_64-pic bash -c ' make clean-native native-nocmake OS_NAME=Linux OS_ARCH=x86_64'
182
183
183
184
freebsd64 :
184
185
$(MAKE ) native OS_NAME=FreeBSD OS_ARCH=x86_64
Original file line number Diff line number Diff line change @@ -25,15 +25,15 @@ RUN cd /tmp/work/objdir \
25
25
&& make install \
26
26
&& rm -rf /tmp/work
27
27
28
- RUN mkdir /tmp/cmake \
29
- && cd /tmp/cmake \
30
- && wget --no-check-certificate https://cmake.org/files/v3.10/cmake-3.10.0.tar.gz \
31
- && tar xvfz cmake-3.10.0.tar.gz \
32
- && cd cmake-3.10.0 \
33
- && ./bootstrap CXX=/usr/local/gcc-4.8.3/bin/g++ \
34
- && make \
35
- && make install \
36
- && rm -rf /tmp/cmake
28
+ # RUN mkdir /tmp/cmake \
29
+ # && cd /tmp/cmake \
30
+ # && wget --no-check-certificate https://cmake.org/files/v3.10/cmake-3.10.0.tar.gz \
31
+ # && tar xvfz cmake-3.10.0.tar.gz \
32
+ # && cd cmake-3.10.0 \
33
+ # && CXX=/usr/local/gcc-4.8.3/bin/g++ ./bootstrap \
34
+ # && make \
35
+ # && make install \
36
+ # && rm -rf /tmp/cmake
37
37
38
38
ENV PATH /usr/local/gcc-4.8.3/bin:$PATH
39
39
ENV LD_LIBRARY_PATH /usr/local/gcc-4.8.3/lib64/:$LD_LIBRARY_PATH
You can’t perform that action at this time.
0 commit comments