Merge pull request #167 from odaira/aix_ppc_support

Updated libsnappyjava and Makefile for AIX
This commit is contained in:
Taro L. Saito 2017-02-13 11:36:57 -08:00 committed by GitHub
commit 361d5ed4ba
4 changed files with 6 additions and 2 deletions

View File

@ -55,9 +55,13 @@ endif
ifeq ($(OS_NAME),SunOS) ifeq ($(OS_NAME),SunOS)
TAR:= gtar TAR:= gtar
else
ifeq ($(OS_NAME),AIX)
TAR:= gtar
else else
TAR:= tar TAR:= tar
endif endif
endif
$(SNAPPY_ARCHIVE): $(SNAPPY_ARCHIVE):
@mkdir -p $(@D) @mkdir -p $(@D)

View File

@ -120,7 +120,7 @@ AIX-ppc_CXX := g++
AIX-ppc_STRIP := strip AIX-ppc_STRIP := strip
AIX-ppc_LIBNAME := libsnappyjava.a AIX-ppc_LIBNAME := libsnappyjava.a
ifeq ($(IBM_JDK_7),) ifeq ($(IBM_JDK_7),)
AIX-ppc_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden AIX-ppc_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -maix32
else else
AIX-ppc_CXXFLAGS := -DHAVE_CONFIG_H -I$(JAVA_HOME)/include/aix -Ilib/inc_ibm -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -maix32 AIX-ppc_CXXFLAGS := -DHAVE_CONFIG_H -I$(JAVA_HOME)/include/aix -Ilib/inc_ibm -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -maix32
endif endif
@ -131,7 +131,7 @@ AIX-ppc64_CXX := g++
AIX-ppc64_STRIP := strip -X64 AIX-ppc64_STRIP := strip -X64
AIX-ppc64_LIBNAME := libsnappyjava.a AIX-ppc64_LIBNAME := libsnappyjava.a
ifeq ($(IBM_JDK_7),) ifeq ($(IBM_JDK_7),)
AIX-ppc64_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 AIX-ppc64_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -maix64
else else
AIX-ppc64_CXXFLAGS := -DHAVE_CONFIG_H -I$(JAVA_HOME)/include/aix -Ilib/inc_ibm -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -maix64 AIX-ppc64_CXXFLAGS := -DHAVE_CONFIG_H -I$(JAVA_HOME)/include/aix -Ilib/inc_ibm -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -maix64
endif endif