Repository: commons-crypto Updated Branches: refs/heads/master 3f6e54994 -> e230e30d5
CRYPTO-123: Clean CRYPTO build script. Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/e230e30d Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/e230e30d Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/e230e30d Branch: refs/heads/master Commit: e230e30d51115696480f17596ab5b0f05898c287 Parents: 3f6e549 Author: Sun Dapeng <[email protected]> Authored: Wed Sep 7 13:04:13 2016 +0800 Committer: Sun Dapeng <[email protected]> Committed: Wed Sep 7 13:04:13 2016 +0800 ---------------------------------------------------------------------- Makefile.common | 57 +++++++++------------------------------------------- 1 file changed, 10 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/e230e30d/Makefile.common ---------------------------------------------------------------------- diff --git a/Makefile.common b/Makefile.common index ceecbaf..0f50098 100644 --- a/Makefile.common +++ b/Makefile.common @@ -41,7 +41,6 @@ OSINFO_PROG := $(TARGET)/classes/org/apache/commons/crypto/OsInfo.class OS_NAME := $(shell $(JAVA) -cp $(TARGET)/classes $(OSINFO_CLASS) --os) OS_ARCH := $(shell $(JAVA) -cp $(TARGET)/classes $(OSINFO_CLASS) --arch) LIB_FOLDER := $(shell $(JAVA) -cp $(TARGET)/classes $(OSINFO_CLASS)) -IBM_JDK_LIB := lib/inc_ibm commons-crypto := commons-crypto-$(VERSION) @@ -56,7 +55,6 @@ endif known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armhf Linux-ppc Linux-ppc64 Mac-x86 Mac-x86_64 FreeBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc64 os_arch := $(OS_NAME)-$(OS_ARCH) -IBM_JDK_7 := $(findstring IBM, $(shell $(JAVA) -version 2>&1 | grep IBM | grep "JRE 1.7")) ifeq (,$(findstring $(strip $(os_arch)),$(known_os_archs))) os_arch := Default @@ -64,16 +62,6 @@ endif os_folder := $(shell echo $(OS_NAME) | tr A-Z a-z) -ifneq ($(IBM_JDK_7),) - $(shell mkdir -p $(IBM_JDK_LIB)) - $(shell cp $(JAVA_HOME)/include/jniport.h $(IBM_JDK_LIB)) - $(shell sed -i "s|#define JNIEXPORT *$$|#define JNIEXPORT __attribute__((__visibility__(\"default\")))|" $(IBM_JDK_LIB)/jniport.h) - $(shell sed -i "s|typedef long long jlong;.*|/*typedef long long jlong;*/|" $(IBM_JDK_LIB)/jniport.h) - $(shell cp $(JAVA_HOME)/include/$(os_folder)/jni_md.h $(IBM_JDK_LIB)) - $(shell sed -i "s|#define JNIEXPORT|#define JNIEXPORT __attribute__((__visibility__(\"default\")))|" $(IBM_JDK_LIB)/jni_md.h) - $(shell sed -i "s|typedef long long jlong;.*|/*typedef long long jlong;*/|" $(IBM_JDK_LIB)/jni_md.h) -endif - # cross-compilation toolchain prefix (e.g. "arm-linux-gnueabi-") CROSS_PREFIX := @@ -89,13 +77,8 @@ Default_COMMONS_CRYPTO_FLAGS := Linux-x86_CC := $(CROSS_PREFIX)gcc Linux-x86_CXX := $(CROSS_PREFIX)g++ Linux-x86_STRIP := $(CROSS_PREFIX)strip -ifeq ($(IBM_JDK_7),) - Linux-x86_CXXFLAGS := -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32 - Linux-x86_CFLAGS := -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32 -else - Linux-x86_CXXFLAGS := -include $(IBM_JDK_LIB)/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32 - Linux-x86_CFLAGS := -include $(IBM_JDK_LIB)/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32 -endif +Linux-x86_CXXFLAGS := -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32 +Linux-x86_CFLAGS := -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m32 Linux-x86_LINKFLAGS := -shared -static-libgcc -static-libstdc++ Linux-x86_LIBNAME := libcommons-crypto.so Linux-x86_COMMONS_CRYPTO_FLAGS:= @@ -103,13 +86,8 @@ Linux-x86_COMMONS_CRYPTO_FLAGS:= Linux-x86_64_CC := $(CROSS_PREFIX)gcc Linux-x86_64_CXX := $(CROSS_PREFIX)g++ Linux-x86_64_STRIP := $(CROSS_PREFIX)strip -ifeq ($(IBM_JDK_7),) - Linux-x86_64_CXXFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 - Linux-x86_64_CFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 -else - Linux-x86_64_CXXFLAGS := -include $(IBM_JDK_LIB)/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 - Linux-x86_64_CFLAGS := -include $(IBM_JDK_LIB)/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 -endif +Linux-x86_64_CXXFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 +Linux-x86_64_CFLAGS := -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 Linux-x86_64_LINKFLAGS := -shared -static-libgcc -static-libstdc++ Linux-x86_64_LIBNAME := libcommons-crypto.so Linux-x86_64_COMMONS_CRYPTO_FLAGS := @@ -117,13 +95,8 @@ Linux-x86_64_COMMONS_CRYPTO_FLAGS := Linux-ppc_CC := gcc Linux-ppc_CXX := g++ Linux-ppc_STRIP := strip -ifeq ($(IBM_JDK_7),) - Linux-ppc_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m32 - Linux-ppc_CFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m32 -else - Linux-ppc_CXXFLAGS := -DHAVE_CONFIG_H -include lib/inc_linux/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -O2 -fPIC -m32 - Linux-ppc_CFLAGS := -DHAVE_CONFIG_H -include lib/inc_linux/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -O2 -fPIC -m32 -endif +Linux-ppc_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m32 +Linux-ppc_CFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m32 Linux-ppc_LINKFLAGS := -shared -static-libgcc -static-libstdc++ Linux-ppc_LIBNAME := libcommons-crypto.so Linux-ppc_COMMONS_CRYPTO_FLAGS := @@ -131,13 +104,8 @@ Linux-ppc_COMMONS_CRYPTO_FLAGS := Linux-ppc64_CC := gcc Linux-ppc64_CXX := g++ Linux-ppc64_STRIP := 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 - Linux-ppc64_CFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 -else - Linux-ppc64_CXXFLAGS := -DHAVE_CONFIG_H -include $(IBM_JDK_LIB)/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -O2 -fPIC -m64 - Linux-ppc64_CFLAGS := -DHAVE_CONFIG_H -include $(IBM_JDK_LIB)/jni_md.h -include $(IBM_JDK_LIB)/jniport.h -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -O2 -fPIC -m64 -endif +Linux-ppc64_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 +Linux-ppc64_CFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 Linux-ppc64_LINKFLAGS := -shared -static-libgcc -static-libstdc++ Linux-ppc64_LIBNAME := libcommons-crypto.so Linux-ppc64_COMMONS_CRYPTO_FLAGS := @@ -146,13 +114,8 @@ AIX-ppc64_CC := gcc AIX-ppc64_CXX := g++ AIX-ppc64_STRIP := strip -X64 AIX-ppc64_LIBNAME := libcommons-crypto.a -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_CFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 -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_CFLAGS := -DHAVE_CONFIG_H -I$(JAVA_HOME)/include/aix -Ilib/inc_ibm -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -maix64 -endif +AIX-ppc64_CXXFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 +AIX-ppc64_CFLAGS := -DHAVE_CONFIG_H -Ilib/inc_linux -I$(JAVA_HOME)/include -Ilib/inc_mac -O2 -fPIC -fvisibility=hidden -m64 AIX-ppc64_LINKFLAGS := -shared -static-libgcc -static-libstdc++ -lcrypt AIX-ppc64_COMMONS_CRYPTO_FLAGS :=
