Skip to content

Commit 361d5ed

Browse files
authored
Merge pull request xerial#167 from odaira/aix_ppc_support
Updated libsnappyjava and Makefile for AIX
2 parents 0ab9de2 + 0c73a85 commit 361d5ed

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,13 @@ endif
5555

5656
ifeq ($(OS_NAME),SunOS)
5757
TAR:= gtar
58+
else
59+
ifeq ($(OS_NAME),AIX)
60+
TAR:= gtar
5861
else
5962
TAR:= tar
6063
endif
64+
endif
6165

6266
$(SNAPPY_ARCHIVE):
6367
@mkdir -p $(@D)

Makefile.common

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ AIX-ppc_CXX := g++
120120
AIX-ppc_STRIP := strip
121121
AIX-ppc_LIBNAME := libsnappyjava.a
122122
ifeq ($(IBM_JDK_7),)
123-
AIX-ppc_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden
123+
AIX-ppc_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -maix32
124124
else
125125
AIX-ppc_CXXFLAGS := -DHAVE_CONFIG_H -I$(JAVA_HOME)/include/aix -Ilib/inc_ibm -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -maix32
126126
endif
@@ -131,7 +131,7 @@ AIX-ppc64_CXX := g++
131131
AIX-ppc64_STRIP := strip -X64
132132
AIX-ppc64_LIBNAME := libsnappyjava.a
133133
ifeq ($(IBM_JDK_7),)
134-
AIX-ppc64_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64
134+
AIX-ppc64_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -maix64
135135
else
136136
AIX-ppc64_CXXFLAGS := -DHAVE_CONFIG_H -I$(JAVA_HOME)/include/aix -Ilib/inc_ibm -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -maix64
137137
endif
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)