diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /package/libs/openssl/Makefile | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'package/libs/openssl/Makefile')
| -rw-r--r-- | package/libs/openssl/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 7ee44408d..009157998 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -8,15 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl -PKG_VERSION:=1.0.1c +PKG_VERSION:=1.0.1e 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.funet.fi/pub/crypt/mirrors/ftp.openssl.org/source \ ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ -PKG_MD5SUM:=ae412727c8c15b67880aef7bd2999b2e +PKG_MD5SUM:=66bf6f10f060d561929de96f9dfe5b8c PKG_LICENSE:=SSLEAY OPENSSL PKG_LICENSE_FILES:=LICENSE @@ -112,7 +111,7 @@ define Build/Configure ) endef -TARGET_CFLAGS += $(FPIC) +TARGET_CFLAGS := $(filter-out -mips16 -minterlink-mips16,$(TARGET_CFLAGS)) $(FPIC) define Build/Compile # XXX: OpenSSL "make depend" will look for installed headers before its own, @@ -125,6 +124,7 @@ define Build/Compile depend $(_SINGLE)$(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ + ASFLAGS="$(TARGET_ASFLAGS) -c" \ AR="$(TARGET_CROSS)ar r" \ RANLIB="$(TARGET_CROSS)ranlib" \ OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ @@ -132,6 +132,7 @@ define Build/Compile all $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ + ASFLAGS="$(TARGET_ASFLAGS) -c" \ AR="$(TARGET_CROSS)ar r" \ RANLIB="$(TARGET_CROSS)ranlib" \ OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ |