projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
musl: allow autorebuild
[openwrt/openwrt.git]
/
toolchain
/
musl
/
common.mk
diff --git
a/toolchain/musl/common.mk
b/toolchain/musl/common.mk
index 68cb2396fa1a4fe9cd86755bc1d4896e2be4cb7d..4b53d4b556c80149d854389434006bf4f41532cc 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,21
+8,25
@@
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_VERSION:=
1.1.18
+PKG_RELEASE=
2
PKG_SOURCE_PROTO:=git
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_URL:=git://git.musl-libc.org/musl
-PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=2df4f6f17b1f14684cb991c53c9ef0ddaa8c7bad
-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
+BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
+HOST_BUILD_PREFIX:=$(TOOLCHAIN_DIR)
HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION)
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:= \
$(TARGET_CONFIGURE_OPTS) \
MUSL_CONFIGURE:= \
$(TARGET_CONFIGURE_OPTS) \
@@
-32,12
+36,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)
@@
-56,7
+56,6
@@
define Host/Configure
);
endef
);
endef
-
define Host/Clean
rm -rf \
$(HOST_BUILD_DIR) \
define Host/Clean
rm -rf \
$(HOST_BUILD_DIR) \