X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/b8fd341162fe3f0189c277a198ce6bcf458745c5..5a76cd437c8b0271c03ade8ad07335b2e8f590a3:/package/openssl/Makefile diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 11a9ef2e2..23695fcc2 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl -PKG_VERSION:=0.9.8k -PKG_RELEASE:=2 +PKG_VERSION:=0.9.8l +PKG_RELEASE:=1 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:=e555c6d58d276aec7fdc53363e338ab3 +PKG_MD5SUM:=05a0ece1372392a2cf310ebb96333025 PKG_BUILD_DEPENDS:=ocf-crypto-headers @@ -37,6 +37,7 @@ endef define Package/libopenssl $(call Package/openssl/Default) SECTION:=libs + SUBMENU:=SSL CATEGORY:=Libraries DEPENDS:=+zlib TITLE+= (libraries) @@ -93,8 +94,9 @@ 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)" \ @@ -128,8 +130,8 @@ 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