musl: move BUILD_DIR_TOOLCHAIN/musl symlink to configure step

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

diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk
index 3045c634bc545581cb186d7c64e728ab62188c9b..497aa8df0d8056b53c104e58a6197851760d5b54 100644 (file)
--- a/toolchain/musl/common.mk
+++ b/toolchain/musl/common.mk
@@ -8,27 +8,26 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=musl
-PKG_VERSION:=$(call qstrip,$(CONFIG_MUSL_VERSION))
-PKG_RELEASE=1
+PKG_VERSION:=1.1.18
+PKG_RELEASE=2
 
-PKG_MD5SUM:=48be0777e32f374d387e9cf85e36ec4d
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=72656157f54c47277b01ec85a6ba7c4084fea6c8
+PKG_MIRROR_HASH:=a3d857c23c94aa96a4ad5f442aaf236e5a189a717273c4e4faf425988d98cd32
+PKG_SOURCE_URL:=git://git.musl-libc.org/musl
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 
-PKG_SOURCE_URL:=http://www.musl-libc.org/releases
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 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
 
-# Please see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67260
-ifeq ($(CONFIG_sh3),y)
-TARGET_CFLAGS+= \
-       -fno-optimize-sibling-calls
-endif
-
 MUSL_CONFIGURE:= \
        $(TARGET_CONFIGURE_OPTS) \
        CFLAGS="$(TARGET_CFLAGS)" \
@@ -37,25 +36,11 @@ MUSL_CONFIGURE:= \
                --prefix=/ \
                --host=$(GNU_HOST_NAME) \
                --target=$(REAL_GNU_TARGET_NAME) \
-               --disable-gcc-wrapper
-
-ifeq ($(CONFIG_MUSL_ENABLE_DEBUG),y)
-MUSL_CONFIGURE+= \
-       --enable-debug
-endif
-
-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
+               --disable-gcc-wrapper \
+               --enable-debug
 
 define Host/Configure
+       ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
        ( cd $(HOST_BUILD_DIR); rm -f config.cache; \
                $(MUSL_CONFIGURE) \
        );