musl: update to version 1.1.19

[openwrt/openwrt.git] / toolchain / musl / common.mk

diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk
index fc6253b5f9d22a0a02e92ca0913681a55a900bb4..87424646c30ad9d0d4ed50de41ccfd48ba59d890 100644 (file)
--- a/toolchain/musl/common.mk
+++ b/toolchain/musl/common.mk
@@ -8,22 +8,24 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=musl
-PKG_VERSION:=1.1.16
+PKG_VERSION:=1.1.19
 PKG_RELEASE=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=769f53598e781ffc89191520f3f8a93cb58db91f
-PKG_MIRROR_HASH:=c148c570cc46471ab30a1b36e96531519837e41c4347f3164bf610ab98741d80
+PKG_SOURCE_VERSION:=55df09bfccbfe21fc9dd7d8f94550c0ff25ace04
+PKG_MIRROR_HASH:=eb94e4e7e94221dd8890afd9b29e2562c36cf5585649035349ca1c6c1c354f2b
 PKG_SOURCE_URL:=git://git.musl-libc.org/musl
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 
 LIBC_SO_VERSION:=$(PKG_VERSION)
 PATCH_DIR:=$(PATH_PREFIX)/patches
 
+BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
+HOST_BUILD_PREFIX:=$(TOOLCHAIN_DIR)
 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
 
-include $(INCLUDE_DIR)/toolchain-build.mk
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/hardening.mk
 
 MUSL_CONFIGURE:= \
@@ -37,18 +39,8 @@ MUSL_CONFIGURE:= \
                --disable-gcc-wrapper \
                --enable-debug
 
-define Host/Prepare
-       $(call Host/Prepare/Default)
-       $(if $(strip $(QUILT)), \
-               cd $(HOST_BUILD_DIR); \
-               if $(QUILT_CMD) next >/dev/null 2>&1; then \
-                       $(QUILT_CMD) push -a; \
-               fi
-       )
-       ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
-endef
-
 define Host/Configure
+       ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
        ( cd $(HOST_BUILD_DIR); rm -f config.cache; \
                $(MUSL_CONFIGURE) \
        );