X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/26862c3e56fe9164f7a7a45305d99965145b975e..3d9b27b735b76d16c6bad5dc202a731883e7b888:/package/openssl/Makefile?ds=inline diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 23695fcc2..2d2a94049 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl PKG_VERSION:=0.9.8l -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.openssl.org/source/ \ @@ -18,7 +18,8 @@ PKG_SOURCE_URL:=http://www.openssl.org/source/ \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ PKG_MD5SUM:=05a0ece1372392a2cf310ebb96333025 -PKG_BUILD_DEPENDS:=ocf-crypto-headers +PKG_BUILD_DEPENDS := ocf-crypto-headers +PKG_CONFIG_DEPENDS := CONFIG_OPENSSL_ENGINE include $(INCLUDE_DIR)/package.mk @@ -27,6 +28,10 @@ define Package/openssl/Default URL:=http://www.openssl.org/ endef +define Package/libopenssl/config +source "$(SOURCE)/Config.in" +endef + define Package/openssl/Default/description The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured, and Open Source toolkit implementing the @@ -69,14 +74,19 @@ endef OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-smime \ no-rmd160 no-aes192 no-ripemd no-camellia no-ans1 no-krb5 -ifeq ($(BOARD),ixp4xx) -OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic \ - no-sse2 no-perlasm --with-cryptodev +OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic no-sse2 + +ifdef CONFIG_OPENSSL_ENGINE + OPENSSL_OPTIONS += --with-cryptodev else -OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic \ - no-engines no-sse2 no-perlasm + OPENSSL_OPTIONS += no-engines endif +ifdef CONFIG_arm +OPENSSL_MAKEFLAGS := AES_ASM_OBJ="aes-armv4.o aes_cbc.o" +else +OPENSSL_OPTIONS += no-perlasm +endif define Build/Configure (cd $(PKG_BUILD_DIR); \ @@ -100,21 +110,25 @@ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ MAKEDEPPROG="$(TARGET_CROSS)gcc" \ OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ + $(OPENSSL_MAKEFLAGS) \ depend $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ AR="$(TARGET_CROSS)ar r" \ RANLIB="$(TARGET_CROSS)ranlib" \ OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ + $(OPENSSL_MAKEFLAGS) \ all build-shared # Work around openssl build bug to link libssl.so with libcrypto.so. -rm $(PKG_BUILD_DIR)/libssl.so.*.*.* $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ + $(OPENSSL_MAKEFLAGS) \ do_linux-shared $(MAKE) -C $(PKG_BUILD_DIR) \ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ + $(OPENSSL_MAKEFLAGS) \ install endef