tyler.durden/snappy-java
1
0
Fork 0
mirror of https://github.com/xerial/snappy-java.git synced 2025-07-04 04:34:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add linu32 linu64 targets

Browse Source
This commit is contained in:
xerial 2017-01-19 16:48:28 -08:00
parent 21adc98015
commit fc1de99c3a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -130,7 +130,7 @@ snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s
native: $(NATIVE_DLL) native: $(NATIVE_DLL)
snappy: native $(TARGET)/$(snappy-jar-version).jar snappy: native $(TARGET)/$(snappy-jar-version).jar
native-all: win32 win64 mac64 native-arm linux-ppc64 linux-aarch64 native-all: win32 win64 mac64 native-arm linux32 linux64 linux-ppc64 linux-aarch64
$(NATIVE_DLL): $(SNAPPY_SOURCE_CONFIGURED) $(SNAPPY_OUT)/$(LIBNAME) $(NATIVE_DLL): $(SNAPPY_SOURCE_CONFIGURED) $(SNAPPY_OUT)/$(LIBNAME)
@mkdir -p $(@D) @mkdir -p $(@D)
@ -163,7 +163,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 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 linux32: jni-header
docker run $(DOCKER_RUN_OPTS) -ti -v $$PWD:/work xerial/centos5-linux-x86 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 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'
freebsd64: freebsd64:
$(MAKE) native OS_NAME=FreeBSD OS_ARCH=x86_64 $(MAKE) native OS_NAME=FreeBSD OS_ARCH=x86_64

8
docker/Dockerfile.cxx-pic → docker/Dockerfile.centos5-linux-x86_64-pic
View File

@ -15,9 +15,13 @@ RUN mkdir /tmp/work \
RUN cd /tmp/work/objdir \ RUN cd /tmp/work/objdir \
&& ../gcc-4.8.3/configure --prefix=/usr/local/gcc-4.8.3 CXXFLAGS=-fPIC CFLAGS=-fPIC --enable-languages=c,c++ \ && ../gcc-4.8.3/configure --prefix=/usr/local/gcc-4.8.3 CXXFLAGS=-fPIC CFLAGS=-fPIC --enable-languages=c,c++ \
&& make \ && make
&& make install
RUN cd /tmp/work/objdir \
&& make install \
&& rm -rf /tmp/work && rm -rf /tmp/work
ENV PATH /usr/local/gcc-4.8.3/bin:$PATH ENV PATH /usr/local/gcc-4.8.3/bin:$PATH
ENV LD_LIBRARY_PATH /usr/local/gcc-4.8.3/lib64/:$LD_LIBRARY_PATH
WORKDIR /work WORKDIR /work