centos5 cannot use cmake3, so provide pre-configured header files instead
This commit is contained in:
parent
64e9238f6c
commit
6b2384d65c
5
Makefile
5
Makefile
|
@ -141,6 +141,7 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
|
|||
snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$$/d")
|
||||
|
||||
native: jni-header snappy-header $(NATIVE_DLL)
|
||||
native-nocmake: jni-header $(NATIVE_DLL)
|
||||
snappy: native $(TARGET)/$(snappy-jar-version).jar
|
||||
|
||||
native-all: win32 win64 mac64 native-arm linux32 linux64 linux-ppc64le linux-aarch64
|
||||
|
@ -175,10 +176,10 @@ mac64: jni-header
|
|||
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
|
||||
|
||||
linux32: jni-header
|
||||
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'
|
||||
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'
|
||||
|
||||
linux64: jni-header
|
||||
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'
|
||||
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'
|
||||
|
||||
freebsd64:
|
||||
$(MAKE) native OS_NAME=FreeBSD OS_ARCH=x86_64
|
||||
|
|
|
@ -25,15 +25,15 @@ RUN cd /tmp/work/objdir \
|
|||
&& make install \
|
||||
&& rm -rf /tmp/work
|
||||
|
||||
RUN mkdir /tmp/cmake \
|
||||
&& cd /tmp/cmake \
|
||||
&& wget --no-check-certificate https://cmake.org/files/v3.10/cmake-3.10.0.tar.gz \
|
||||
&& tar xvfz cmake-3.10.0.tar.gz \
|
||||
&& cd cmake-3.10.0 \
|
||||
&& ./bootstrap CXX=/usr/local/gcc-4.8.3/bin/g++ \
|
||||
&& make \
|
||||
&& make install \
|
||||
&& rm -rf /tmp/cmake
|
||||
#RUN mkdir /tmp/cmake \
|
||||
# && cd /tmp/cmake \
|
||||
# && wget --no-check-certificate https://cmake.org/files/v3.10/cmake-3.10.0.tar.gz \
|
||||
# && tar xvfz cmake-3.10.0.tar.gz \
|
||||
# && cd cmake-3.10.0 \
|
||||
# && CXX=/usr/local/gcc-4.8.3/bin/g++ ./bootstrap \
|
||||
# && make \
|
||||
# && make install \
|
||||
# && rm -rf /tmp/cmake
|
||||
|
||||
ENV PATH /usr/local/gcc-4.8.3/bin:$PATH
|
||||
ENV LD_LIBRARY_PATH /usr/local/gcc-4.8.3/lib64/:$LD_LIBRARY_PATH
|
||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue