From fc1de99c3a592dae2912dda76ed475eccef6c7cc Mon Sep 17 00:00:00 2001
From: xerial <leo@xerial.org>
Date: Thu, 19 Jan 2017 16:48:28 -0800
Subject: [PATCH] Add linu32 linu64 targets

---
 Makefile                                                  | 7 +++++--
 ...erfile.cxx-pic => Dockerfile.centos5-linux-x86_64-pic} | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)
 rename docker/{Dockerfile.cxx-pic => Dockerfile.centos5-linux-x86_64-pic} (83%)

diff --git a/Makefile b/Makefile
index bbb4263..ffe230f 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,7 @@ snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s
 native: $(NATIVE_DLL)
 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)
 	@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
 
 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:
 	$(MAKE) native OS_NAME=FreeBSD OS_ARCH=x86_64
diff --git a/docker/Dockerfile.cxx-pic b/docker/Dockerfile.centos5-linux-x86_64-pic
similarity index 83%
rename from docker/Dockerfile.cxx-pic
rename to docker/Dockerfile.centos5-linux-x86_64-pic
index ed9d647..d601179 100644
--- a/docker/Dockerfile.cxx-pic
+++ b/docker/Dockerfile.centos5-linux-x86_64-pic
@@ -15,9 +15,13 @@ RUN mkdir /tmp/work \
 
 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++ \
-  && make \
-  && make install
+  && make
+
+RUN cd /tmp/work/objdir \
+  && make install \
   && rm -rf /tmp/work
 
 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