X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/868fc521a640bc311871f364d0846dcfe3e750f2..ba38e0585024837bc59c618bdd2adfd42d2d9af8:/package/openssl/Makefile?ds=inline diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 9fca6b149..e6788172d 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -1,23 +1,24 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=openssl -PKG_VERSION:=0.9.8h -PKG_RELEASE:=1 +PKG_VERSION:=0.9.8k +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.openssl.org/source/ \ ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \ ftp://ftp.webmonster.de/pub/openssl/source/ \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ -PKG_MD5SUM:=7d3d41dafc76cf2fcb5559963b5783b3 +PKG_MD5SUM:=e555c6d58d276aec7fdc53363e338ab3 + +PKG_BUILD_DEPENDS:=ocf-crypto-headers include $(INCLUDE_DIR)/package.mk @@ -27,15 +28,16 @@ define Package/openssl/Default 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 - Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) + The OpenSSL Project is a collaborative effort to develop a robust, + commercial-grade, full-featured, and Open Source toolkit implementing the + Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols as well as a full-strength general purpose cryptography library. endef define Package/libopenssl $(call Package/openssl/Default) SECTION:=libs + SUBMENU:=SSL CATEGORY:=Libraries DEPENDS:=+zlib TITLE+= (libraries) @@ -43,7 +45,7 @@ endef define Package/libopenssl/description $(call Package/openssl/Default/description) - This package contains the OpenSSL shared libraries, needed by other + This package contains the OpenSSL shared libraries, needed by other programs. endef @@ -65,10 +67,15 @@ $(call Package/openssl/Default/description) endef -OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc2 no-rc5 no-sha0 no-smime \ +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 -OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-threads zlib-dynamic \ +ifeq ($(BOARD),ixp4xx) +OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic \ + no-sse2 no-perlasm --with-cryptodev +else +OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic \ no-engines no-sse2 no-perlasm +endif define Build/Configure @@ -84,9 +91,12 @@ define Build/Configure ) endef +TARGET_CFLAGS += $(FPIC) + define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) + # XXX: OpenSSL "make depend" will look for installed headers before its own, + # so remove installed stuff first + -$(SUBMAKE) -j1 clean-staging $(MAKE) -C $(PKG_BUILD_DIR) \ MAKEDEPPROG="$(TARGET_CROSS)gcc" \ OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ @@ -115,13 +125,13 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(1)/usr/lib/ mkdir -p $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc $(1)/usr/lib/pkgconfig/ - $(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc + $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc endef define Package/libopenssl/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(1)/usr/lib/ - chmod 0644 $(1)/usr/lib/* + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libcrypto.so.* $(1)/usr/lib/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libssl.so.* $(1)/usr/lib/ endef define Package/openssl-util/install