OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 6... Line 6...
6 # 6 #
Line 7... Line 7...
7   7  
Line 8... Line 8...
8 include $(TOPDIR)/rules.mk 8 include $(TOPDIR)/rules.mk
9   9  
10 PKG_NAME:=mbedtls 10 PKG_NAME:=mbedtls
11 PKG_VERSION:=2.16.0 11 PKG_VERSION:=2.12.0
Line 12... Line 12...
12 PKG_RELEASE:=2 12 PKG_RELEASE:=1
13 PKG_USE_MIPS16:=0 13 PKG_USE_MIPS16:=0
14   14  
Line 15... Line 15...
15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz 15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
16 PKG_SOURCE_URL:=https://tls.mbed.org/download/ 16 PKG_SOURCE_URL:=https://tls.mbed.org/download/
17 PKG_HASH:=c8d7a4696287cb9533c455bdd65859106dbdd4472c125194387486e6d4df2799 17 PKG_HASH:=8661d19a896a5a7a232ed01ac7f05cf0ec3514798f18076c2c9ef965fbeb5a28
Line 18... Line -...
18   -  
19 PKG_BUILD_PARALLEL:=1 -  
20 PKG_LICENSE:=GPL-2.0+ 18  
21 PKG_CPE_ID:=cpe:/a:arm:mbed_tls 19 PKG_BUILD_PARALLEL:=1
Line 22... Line 20...
22   20 PKG_LICENSE:=GPL-2.0+
23 PKG_CONFIG_DEPENDS:=CONFIG_LIBMBEDTLS_DEBUG_C 21 PKG_CPE_ID:=cpe:/a:arm:mbed_tls
Line 39... Line 37...
39 $(call Package/mbedtls/Default) 37 $(call Package/mbedtls/Default)
40 SECTION:=libs 38 SECTION:=libs
41 CATEGORY:=Libraries 39 CATEGORY:=Libraries
42 SUBMENU:=SSL 40 SUBMENU:=SSL
43 TITLE+= (library) 41 TITLE+= (library)
44 ABI_VERSION:=12 42 ABI_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
45 endef -  
46   -  
47 define Package/libmbedtls/config -  
48 config LIBMBEDTLS_DEBUG_C -  
49 depends on PACKAGE_libmbedtls -  
50 bool "Enable debug functions" -  
51 default n -  
52 help -  
53 This option enables mbedtls library's debug functions. -  
54 -  
55 It increases the uncompressed libmbedtls binary size -  
56 by around 60 KiB (for an ARMv5 platform). -  
57 -  
58 Usually, you don't need this, so don't select this if you're unsure. -  
59 endef 43 endef
Line 60... Line 44...
60   44  
61 define Package/mbedtls-util 45 define Package/mbedtls-util
62 $(call Package/mbedtls/Default) 46 $(call Package/mbedtls/Default)
Line 78... Line 62...
78 endef 62 endef
Line 79... Line 63...
79   63  
Line 80... Line 64...
80 PKG_INSTALL:=1 64 PKG_INSTALL:=1
81   -  
Line 82... Line 65...
82 TARGET_CFLAGS += -ffunction-sections -fdata-sections 65  
-   66 TARGET_CFLAGS += -ffunction-sections -fdata-sections
83 TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS)) 67  
84   68 CMAKE_OPTIONS += \
85 CMAKE_OPTIONS += \ 69 -DCMAKE_BUILD_TYPE:String="Release" \
Line 86... Line -...
86 -DUSE_SHARED_MBEDTLS_LIBRARY:Bool=ON \ -  
87 -DENABLE_TESTING:Bool=OFF \ -  
88 -DENABLE_PROGRAMS:Bool=ON -  
89   -  
90 define Build/Configure -  
91 $(Build/Configure/Default) -  
92   -  
93 awk 'BEGIN { rc = 1 } \ -  
94 /#define MBEDTLS_DEBUG_C/ { $$$$0 = "$(if $(CONFIG_LIBMBEDTLS_DEBUG_C),,// )#define MBEDTLS_DEBUG_C"; rc = 0 } \ -  
95 { print } \ -  
96 END { exit(rc) }' $(PKG_BUILD_DIR)/include/mbedtls/config.h \ -  
97 >$(PKG_BUILD_DIR)/include/mbedtls/config.h.new && \ 70 -DUSE_SHARED_MBEDTLS_LIBRARY:Bool=ON \
98 mv $(PKG_BUILD_DIR)/include/mbedtls/config.h.new $(PKG_BUILD_DIR)/include/mbedtls/config.h 71 -DENABLE_TESTING:Bool=OFF \
99 endef 72 -DENABLE_PROGRAMS:Bool=ON
100   73  
101 define Build/InstallDev 74 define Build/InstallDev
102 $(INSTALL_DIR) $(1)/usr/include 75 $(INSTALL_DIR) $(1)/usr/include
103 $(CP) $(PKG_INSTALL_DIR)/usr/include/mbedtls $(1)/usr/include/ 76 $(CP) $(PKG_INSTALL_DIR)/usr/include/mbedtls $(1)/usr/include/
Line 104... Line 77...
104 $(INSTALL_DIR) $(1)/usr/lib 77 $(INSTALL_DIR) $(1)/usr/lib
105 $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/ 78 $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/
106 $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.a $(1)/usr/lib/ 79 $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.a $(1)/usr/lib/
107 endef 80 endef
Line 108... Line 81...
108   81  
109 define Package/libmbedtls/install 82 define Package/libmbedtls/install
110 $(INSTALL_DIR) $(1)/usr/lib 83 $(INSTALL_DIR) $(1)/usr/lib