X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fyousong.git;a=blobdiff_plain;f=package%2Flibs%2Fopenssl%2FMakefile;h=a09c148f7b1ad9d379bf3041b2abefd0ad715e5c;hp=23fc555c43f29f54365e2ec4e6c8bce01bb3c4a8;hb=b1f39d3d7ee7ba0714e45af64a935b01877a5175;hpb=c8ad508d37297400364ee276733de90d29e94778 diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 23fc555c43..a09c148f7b 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2014 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,27 +8,45 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl -PKG_VERSION:=1.0.1j +PKG_BASE:=1.0.2 +PKG_BUGFIX:=j +PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX) PKG_RELEASE:=1 PKG_USE_MIPS16:=0 -PKG_BUILD_PARALLEL:=1 +PKG_BUILD_PARALLEL:=0 + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.openssl.org/source/ \ + ftp://ftp.openssl.org/source/ \ + http://www.openssl.org/source/old/$(PKG_BASE)/ \ ftp://ftp.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ -PKG_MD5SUM:=f7175c9cd3c39bb1907ac8bba9df8ed3 +PKG_MD5SUM:=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 -PKG_LICENSE:=SSLEAY OPENSSL +PKG_LICENSE:=OpenSSL PKG_LICENSE_FILES:=LICENSE -PKG_BUILD_DEPENDS:=ocf-crypto-headers -PKG_CONFIG_DEPENDS:=CONFIG_OPENSSL_ENGINE_CRYPTO CONFIG_OPENSSL_ENGINE_DIGEST \ - CONFIG_OPENSSL_WITH_EC CONFIG_OPENSSL_WITH_EC2M +PKG_CONFIG_DEPENDS:= \ + CONFIG_OPENSSL_ENGINE_CRYPTO \ + CONFIG_OPENSSL_ENGINE_DIGEST \ + CONFIG_OPENSSL_WITH_EC \ + CONFIG_OPENSSL_WITH_EC2M \ + CONFIG_OPENSSL_WITH_SSL3 \ + CONFIG_OPENSSL_HARDWARE_SUPPORT \ + CONFIG_OPENSSL_WITH_DEPRECATED \ + CONFIG_OPENSSL_WITH_DTLS \ + CONFIG_OPENSSL_WITH_COMPRESSION \ + CONFIG_OPENSSL_WITH_NPN \ + CONFIG_OPENSSL_WITH_PSK \ + CONFIG_OPENSSL_WITH_SRP include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host.mk -include $(INCLUDE_DIR)/host-build.mk + +ifneq ($(CONFIG_CCACHE),) +HOSTCC=$(HOSTCC_NOCACHE) +HOSTCXX=$(HOSTCXX_NOCACHE) +endif define Package/openssl/Default TITLE:=Open source SSL toolkit @@ -51,7 +69,7 @@ $(call Package/openssl/Default) SECTION:=libs SUBMENU:=SSL CATEGORY:=Libraries - DEPENDS:=+zlib + DEPENDS:=+OPENSSL_WITH_COMPRESSION:zlib TITLE+= (libraries) ABI_VERSION:=$(PKG_VERSION) MENU:=1 @@ -80,9 +98,9 @@ This package contains the OpenSSL command-line utility. endef -OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-smime \ - no-aes192 no-camellia no-ans1 no-krb5 -OPENSSL_OPTIONS:= shared no-err no-hw zlib-dynamic no-sse2 +OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-camellia no-krb5 \ + no-whrlpool no-whirlpool no-seed no-jpake +OPENSSL_OPTIONS:= shared no-err no-sse2 no-ssl2 no-ssl2-method no-heartbeats ifdef CONFIG_OPENSSL_ENGINE_CRYPTO OPENSSL_OPTIONS += -DHAVE_CRYPTODEV @@ -101,13 +119,49 @@ ifndef CONFIG_OPENSSL_WITH_EC2M OPENSSL_OPTIONS += no-ec2m endif +ifndef CONFIG_OPENSSL_WITH_SSL3 + OPENSSL_OPTIONS += no-ssl3 no-ssl3-method +endif + +ifndef CONFIG_OPENSSL_HARDWARE_SUPPORT + OPENSSL_OPTIONS += no-hw +endif + +ifndef CONFIG_OPENSSL_WITH_DEPRECATED + OPENSSL_OPTIONS += no-deprecated +endif + +ifndef CONFIG_OPENSSL_WITH_DTLS + OPENSSL_OPTIONS += no-dtls +endif + +ifdef CONFIG_OPENSSL_WITH_COMPRESSION + OPENSSL_OPTIONS += zlib-dynamic +else + OPENSSL_OPTIONS += no-comp +endif + +ifndef CONFIG_OPENSSL_WITH_NPN + OPENSSL_OPTIONS += no-nextprotoneg +endif + +ifndef CONFIG_OPENSSL_WITH_PSK + OPENSSL_OPTIONS += no-psk +endif + +ifndef CONFIG_OPENSSL_WITH_SRP + OPENSSL_OPTIONS += no-srp +endif + ifeq ($(CONFIG_x86_64),y) - OPENSSL_TARGET:=linux-x86_64 + OPENSSL_TARGET:=linux-x86_64-openwrt OPENSSL_MAKEFLAGS += LIBDIR=lib else OPENSSL_OPTIONS+=no-sse2 ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y) OPENSSL_TARGET:=linux-mips-openwrt + else ifeq ($(CONFIG_arm)$(CONFIG_armeb),y) + OPENSSL_TARGET:=linux-armv4-openwrt else OPENSSL_TARGET:=linux-generic-openwrt OPENSSL_OPTIONS+=no-perlasm @@ -141,12 +195,13 @@ define Build/Configure depend endef -TARGET_CFLAGS += $(FPIC) +TARGET_CFLAGS += $(FPIC) -I$(CURDIR)/include -ffunction-sections -fdata-sections +TARGET_LDFLAGS += -Wl,--gc-sections define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ - ASFLAGS="$(TARGET_ASFLAGS) -c" \ + ASFLAGS="$(TARGET_ASFLAGS) -I$(PKG_BUILD_DIR)/crypto -c" \ AR="$(TARGET_CROSS)ar r" \ RANLIB="$(TARGET_CROSS)ranlib" \ OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ @@ -154,7 +209,7 @@ define Build/Compile all +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ - ASFLAGS="$(TARGET_ASFLAGS) -c" \ + ASFLAGS="$(TARGET_ASFLAGS) -I$(PKG_BUILD_DIR)/crypto -c" \ AR="$(TARGET_CROSS)ar r" \ RANLIB="$(TARGET_CROSS)ranlib" \ OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ @@ -200,59 +255,5 @@ define Package/openssl-util/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/openssl $(1)/usr/bin/ endef - -HOST_CPPFLAGS += $(HOST_FPIC) - -ifeq ($(HOST_ARCH),x86_64) - OPENSSL_HOST_TARGET:=linux-x86_64 -else - OPENSSL_HOST_TARGET:=linux-generic32 -endif - -define Host/Configure - [ -f $(HOST_STAMP_CONFIGURED) ] || { \ - rm -f $(HOST_BUILD_DIR)/*.so.* $(HOST_BUILD_DIR)/*.a; \ - find $(HOST_BUILD_DIR) -name \*.o | xargs rm -f; \ - } - (cd $(HOST_BUILD_DIR); \ - ./Configure "$(OPENSSL_HOST_TARGET)" \ - --prefix=/usr \ - --openssldir=/etc/ssl \ - $(HOST_CPPFLAGS) \ - $(HOST_LDFLAGS) -ldl \ - $(OPENSSL_NO_CIPHERS) \ - shared zlib-dynamic \ - ) - # XXX: OpenSSL "make depend" will look for installed headers before its own, - # so remove installed stuff first - -$(SUBMAKE) -j1 clean-staging - +$(MAKE) $(PKG_JOBS) -C $(HOST_BUILD_DIR) \ - MAKEDEPPROG="$(HOSTCC)" \ - depend -endef - -define Host/Compile - +$(MAKE) $(PKG_JOBS) -C $(HOST_BUILD_DIR) \ - CC="$(HOSTCC)" \ - all - +$(MAKE) $(PKG_JOBS) -C $(HOST_BUILD_DIR) \ - CC="$(HOSTCC)" \ - build-shared - # Work around openssl build bug to link libssl.so with libcrypto.so. - -rm $(HOST_BUILD_DIR)/libssl.so.*.*.* - +$(MAKE) $(PKG_JOBS) -C $(HOST_BUILD_DIR) \ - CC="$(HOSTCC)" \ - do_linux-shared -endef - -define Host/Install - $(MAKE) -C $(HOST_BUILD_DIR) \ - CC="$(HOSTCC)" \ - INSTALL_PREFIX="$(STAGING_DIR_HOST)" \ - install -endef - - $(eval $(call BuildPackage,libopenssl)) $(eval $(call BuildPackage,openssl-util)) -$(eval $(call HostBuild))