OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 6... Line 6...
6 # 6 #
7 include $(TOPDIR)/rules.mk 7 include $(TOPDIR)/rules.mk
8 include $(INCLUDE_DIR)/target.mk 8 include $(INCLUDE_DIR)/target.mk
Line 9... Line 9...
9   9  
10 PKG_NAME:=musl 10 PKG_NAME:=musl
11 PKG_VERSION:=1.1.21 11 PKG_VERSION:=1.1.19
Line 12... Line 12...
12 PKG_RELEASE:=1 12 PKG_RELEASE=1
13   13  
14 PKG_SOURCE_PROTO:=git 14 PKG_SOURCE_PROTO:=git
15 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) 15 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
16 PKG_SOURCE_VERSION:=1691b23955590d1eb66a11158fdd91c86337e886 16 PKG_SOURCE_VERSION:=55df09bfccbfe21fc9dd7d8f94550c0ff25ace04
17 PKG_MIRROR_HASH:=4fa312d0ca020d31603ced84a7103fb328c6ae9508239491a228be17e7807147 17 PKG_MIRROR_HASH:=eb94e4e7e94221dd8890afd9b29e2562c36cf5585649035349ca1c6c1c354f2b
Line 18... Line 18...
18 PKG_SOURCE_URL:=git://git.musl-libc.org/musl 18 PKG_SOURCE_URL:=git://git.musl-libc.org/musl
19 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz 19 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
Line 26... Line 26...
26 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION) 26 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
Line 27... Line 27...
27   27  
28 include $(INCLUDE_DIR)/host-build.mk 28 include $(INCLUDE_DIR)/host-build.mk
Line 29... Line -...
29 include $(INCLUDE_DIR)/hardening.mk -  
30   -  
31 TARGET_CFLAGS:= $(filter-out -O%,$(TARGET_CFLAGS)) -  
32 TARGET_CFLAGS+= $(if $(CONFIG_MUSL_DISABLE_CRYPT_SIZE_HACK),,-DCRYPT_SIZE_HACK) 29 include $(INCLUDE_DIR)/hardening.mk
33   30  
34 MUSL_CONFIGURE:= \ 31 MUSL_CONFIGURE:= \
35 $(TARGET_CONFIGURE_OPTS) \ 32 $(TARGET_CONFIGURE_OPTS) \
36 CFLAGS="$(TARGET_CFLAGS)" \ 33 CFLAGS="$(TARGET_CFLAGS)" \
37 CROSS_COMPILE="$(TARGET_CROSS)" \ 34 CROSS_COMPILE="$(TARGET_CROSS)" \
38 $(HOST_BUILD_DIR)/configure \ 35 $(HOST_BUILD_DIR)/configure \
39 --prefix=/ \ 36 --prefix=/ \
40 --host=$(GNU_HOST_NAME) \ 37 --host=$(GNU_HOST_NAME) \
41 --target=$(REAL_GNU_TARGET_NAME) \ 38 --target=$(REAL_GNU_TARGET_NAME) \
42 --disable-gcc-wrapper \ -  
Line 43... Line 39...
43 --enable-debug \ 39 --disable-gcc-wrapper \
44 --enable-optimize 40 --enable-debug
45   41  
46 define Host/Configure 42 define Host/Configure