Rebuilt windows images

Makefile

@@ -160,8 +160,8 @@ mac32: jni-header
 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:
+linux32: jni-header
-	$(MAKE) native OS_NAME=Linux OS_ARCH=x86
+	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'
 
 freebsd64:
 	$(MAKE) native OS_NAME=FreeBSD OS_ARCH=x86_64

docker/Dockerfile.cxx-pic

@@ -0,0 +1,23 @@
+FROM centos:5
+MAINTAINER Taro L. Saito <leo@xerial.org>
+
+RUN yum -y install make gcc gcc-c++ glibc-devel perl wget bzip2 \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir /tmp/work \
+  && cd /tmp/work \
+  && wget http://www.netgull.com/gcc/releases/gcc-4.8.3/gcc-4.8.3.tar.gz \
+  && tar xvfz gcc-4.8.3.tar.gz \
+  && cd gcc-4.8.3 \
+  && ./contrib/download_prerequisites \
+  && cd .. \
+  && mkdir 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++ \
+  && make \
+  && make install
+  && rm -rf /tmp/work
+
+ENV PATH /usr/local/gcc-4.8.3/bin:$PATH
+WORKDIR /work

docker/Dockerfile.pic-linux_x86_64

@@ -1,6 +0,0 @@
-FROM centos:5
-MAINTAINER Taro L. Saito <leo@xerial.org>
-
-RUN yum -y install gcc make perl
-
-WORKDIR /work

src/main/java/org/xerial/snappy/OSInfo.java

@@ -176,11 +176,11 @@ public class OSInfo {
             }
 
             // For java7, we stil need to if run some shell commands to determine ABI of JVM
-            String javaHome = System.getProperty("java.home");
             try {
                 // determine if first JVM found uses ARM hard-float ABI
                 int exitCode = Runtime.getRuntime().exec("which readelf").waitFor();
                 if(exitCode == 0) {
+                    String javaHome = System.getProperty("java.home");
                     String[] cmdarray = {"/bin/sh", "-c", "find '" + javaHome +
                         "' -name 'libjvm.so' | head -1 | xargs readelf -A | " +
                         "grep 'Tag_ABI_VFP_args: VFP registers'"};