toolchain/musl: update to version 1.1.18

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

diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk
index 75c050787ffae7eff6a50772010615b6a0acf733..2a615163728b63aa640cd1be83317bc5cf7d0157 100644 (file)
--- a/toolchain/musl/common.mk
+++ b/toolchain/musl/common.mk
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2012-2013 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -8,25 +8,23 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=musl
 include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=musl

-PKG_VERSION:=$(call qstrip,$(CONFIG_MUSL_VERSION))
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_VERSION_0.9.8:=e6dcebd5efa2d390f0a24dc11444024e9fd1990c
-PKG_SOURCE_VERSION_0.9.9:=a57ac9bf64ba202bd94d1b81bddd93b850c7b9d6
-PKG_SOURCE_VERSION_0.9.10:=7bec92e793d4b8a349796848cf43c7329b0f2ed0
+PKG_VERSION:=1.1.18
+PKG_RELEASE=1

 
 PKG_SOURCE_PROTO:=git
 
 PKG_SOURCE_PROTO:=git

+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=eb03bde2f24582874cb72b56c7811bf51da0c817
+PKG_MIRROR_HASH:=150808458007eeb0b977059f36f88127d1a1e80ddb6ad1837b5a63efd2958e34

 PKG_SOURCE_URL:=git://git.musl-libc.org/musl
 PKG_SOURCE_URL:=git://git.musl-libc.org/musl

-PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_SOURCE_VERSION_$(PKG_VERSION))
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+

 LIBC_SO_VERSION:=$(PKG_VERSION)
 LIBC_SO_VERSION:=$(PKG_VERSION)

-PATCH_DIR:=$(PATH_PREFIX)/patches-$(PKG_VERSION)
-CONFIG_DIR:=$(PATH_PREFIX)/config-$(PKG_VERSION)
+PATCH_DIR:=$(PATH_PREFIX)/patches

 
 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/toolchain-build.mk
 
 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/toolchain-build.mk

+include $(INCLUDE_DIR)/hardening.mk

 
 MUSL_CONFIGURE:= \
        $(TARGET_CONFIGURE_OPTS) \
 
 MUSL_CONFIGURE:= \
        $(TARGET_CONFIGURE_OPTS) \


@@ -36,12 +34,8 @@ MUSL_CONFIGURE:= \
                --prefix=/ \
                --host=$(GNU_HOST_NAME) \
                --target=$(REAL_GNU_TARGET_NAME) \
                --prefix=/ \
                --host=$(GNU_HOST_NAME) \
                --target=$(REAL_GNU_TARGET_NAME) \

-               --disable-gcc-wrapper
-
-ifeq ($(CONFIG_MUSL_ENABLE_DEBUG),y)
-MUSL_CONFIGURE+= \
-       --enable-debug
-endif
+               --disable-gcc-wrapper \
+               --enable-debug

 
 define Host/Prepare
        $(call Host/Prepare/Default)
 
 define Host/Prepare
        $(call Host/Prepare/Default)


@@ -60,7 +54,6 @@ define Host/Configure
        );
 endef
 
        );
 endef
 

-

 define Host/Clean
        rm -rf \
                $(HOST_BUILD_DIR) \
 define Host/Clean
        rm -rf \
                $(HOST_BUILD_DIR) \