Remove ppc64. Rebuild ppc64le
This commit is contained in:
parent
3497e732ce
commit
e20494cfb2
4
Makefile
4
Makefile
|
@ -135,7 +135,7 @@ snappy-jar-version:=snappy-java-$(shell perl -npe "s/version in ThisBuild\s+:=\s
|
|||
native: jni-header $(NATIVE_DLL)
|
||||
snappy: native $(TARGET)/$(snappy-jar-version).jar
|
||||
|
||||
native-all: win32 win64 mac64 native-arm linux32 linux64 linux-ppc64 linux-ppc64le linux-aarch64
|
||||
native-all: win32 win64 mac64 native-arm linux32 linux64 linux-ppc64le linux-aarch64
|
||||
|
||||
$(NATIVE_DLL): $(SNAPPY_SOURCE_CONFIGURED) $(SNAPPY_OUT)/$(LIBNAME)
|
||||
@mkdir -p $(@D)
|
||||
|
@ -194,7 +194,7 @@ linux-ppc64le: jni-header
|
|||
./docker/dockcross-ppc64le -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=powerpc64le-linux-gnu- OS_NAME=Linux OS_ARCH=ppc64le'
|
||||
|
||||
linux-ppc64: jni-header
|
||||
./docker/dockcross-ppc64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=ppc64-linux-gnu- OS_NAME=Linux OS_ARCH=ppc64'
|
||||
./docker/dockcross-ppc64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=powerpc64-linux-gnu- OS_NAME=Linux OS_ARCH=ppc64'
|
||||
|
||||
linux-aarch64: jni-header
|
||||
./docker/dockcross-aarch64 -a $(DOCKER_RUN_OPTS) bash -c 'make clean-native native CROSS_PREFIX=aarch64-linux-gnu- OS_NAME=Linux OS_ARCH=aarch64'
|
||||
|
|
|
@ -105,8 +105,8 @@ Linux-ppc_LINKFLAGS := -shared -static-libgcc -static-libstdc++
|
|||
Linux-ppc_LIBNAME := libsnappyjava.so
|
||||
Linux-ppc_SNAPPY_FLAGS :=
|
||||
|
||||
Linux-ppc64le_CXX := g++
|
||||
Linux-ppc64le_STRIP := strip
|
||||
Linux-ppc64le_CXX := $(CROSS_PREFIX)g++
|
||||
Linux-ppc64le_STRIP := $(CROSS_PREFIX)strip
|
||||
ifeq ($(IBM_JDK_7),)
|
||||
Linux-ppc64le_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64
|
||||
else
|
||||
|
@ -116,8 +116,8 @@ Linux-ppc64le_LINKFLAGS := -shared -static-libgcc -static-libstdc++
|
|||
Linux-ppc64le_LIBNAME := libsnappyjava.so
|
||||
Linux-ppc64le_SNAPPY_FLAGS :=
|
||||
|
||||
Linux-ppc64_CXX := g++
|
||||
Linux-ppc64_STRIP := strip
|
||||
Linux-ppc64_CXX := $(CROSS_PREFIX)g++
|
||||
Linux-ppc64_STRIP := $(CROSS_PREFIX)strip
|
||||
ifeq ($(IBM_JDK_7),)
|
||||
Linux-ppc64_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64
|
||||
else
|
||||
|
|
|
@ -25,7 +25,7 @@ RUN apt-get update && \
|
|||
make install && \
|
||||
cd .. && rm -rf qemu-2.6.0
|
||||
|
||||
ENV CROSS_TRIPLE ppc64-linux-gnu
|
||||
ENV CROSS_TRIPLE powerpc-linux-gnu
|
||||
ENV CROSS_ROOT /usr/${CROSS_TRIPLE}
|
||||
ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
|
||||
AR=/usr/bin/${CROSS_TRIPLE}-ar \
|
||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue