Skip to content

Commit 6b2384d

Browse files
committed
centos5 cannot use cmake3, so provide pre-configured header files instead
1 parent 64e9238 commit 6b2384d

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
141141
snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d")
142142

143143
native: jni-header snappy-header $(NATIVE_DLL)
144+
native-nocmake: jni-header $(NATIVE_DLL)
144145
snappy: native $(TARGET)/$(snappy-jar-version).jar
145146

146147
native-all: win32 win64 mac64 native-arm linux32 linux64 linux-ppc64le linux-aarch64
@@ -175,10 +176,10 @@ mac64: jni-header
175176
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
176177

177178
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'
179180

180181
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'
182183

183184
freebsd64:
184185
$(MAKE) native OS_NAME=FreeBSD OS_ARCH=x86_64

docker/Dockerfile.centos5-linux-x86_64-pic

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ RUN cd /tmp/work/objdir \
2525
&& make install \
2626
&& rm -rf /tmp/work
2727

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
3737

3838
ENV PATH /usr/local/gcc-4.8.3/bin:$PATH
3939
ENV LD_LIBRARY_PATH /usr/local/gcc-4.8.3/lib64/:$LD_LIBRARY_PATH
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)