openssl: fix upstream regression for non-ec builds

[openwrt/staging/chunkeey.git] / package / libs / openssl / Makefile

diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index 23fc555c43f29f54365e2ec4e6c8bce01bb3c4a8..42165a733ca858ba035cac708bb2130986825879 100644 (file)
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssl
-PKG_VERSION:=1.0.1j
-PKG_RELEASE:=1
+PKG_VERSION:=1.0.2
+PKG_RELEASE:=2
 PKG_USE_MIPS16:=0
 
 PKG_BUILD_PARALLEL:=1
@@ -18,17 +18,24 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openssl.org/source/ \
        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:=38373013fc85c790aabf8837969c5eba
 
-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
 
 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
@@ -80,9 +87,8 @@ 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
+OPENSSL_OPTIONS:= shared no-err no-hw zlib-dynamic no-sse2 no-ssl2
 
 ifdef CONFIG_OPENSSL_ENGINE_CRYPTO
   OPENSSL_OPTIONS += -DHAVE_CRYPTODEV
@@ -101,8 +107,12 @@ ifndef CONFIG_OPENSSL_WITH_EC2M
   OPENSSL_OPTIONS += no-ec2m
 endif
 
+ifndef CONFIG_OPENSSL_WITH_SSL3
+  OPENSSL_OPTIONS += no-ssl3
+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
@@ -200,59 +210,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))