Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -4,13 +4,17 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
UCLIBC_VERSION = 1.0.12
|
||||
UCLIBC_VERSION = 1.0.17
|
||||
UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
|
||||
UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
|
||||
UCLIBC_LICENSE = LGPLv2.1+
|
||||
UCLIBC_LICENSE_FILES = COPYING.LIB
|
||||
UCLIBC_INSTALL_STAGING = YES
|
||||
|
||||
define UCLIBC_HELP_CMDS
|
||||
@echo ' uclibc-menuconfig - Run uClibc menuconfig'
|
||||
endef
|
||||
|
||||
# uclibc is part of the toolchain so disable the toolchain dependency
|
||||
UCLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO
|
||||
|
||||
@@ -47,6 +51,40 @@ UCLIBC_LOCALES = \
|
||||
$(firstword $(subst .,$(space),$(locale))))
|
||||
endif
|
||||
|
||||
# noMMU binary formats
|
||||
ifeq ($(BR2_BINFMT_FDPIC),y)
|
||||
define UCLIBC_BINFMT_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
ifeq ($(BR2_BINFMT_FLAT_ONE),y)
|
||||
define UCLIBC_BINFMT_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y)
|
||||
define UCLIBC_BINFMT_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
|
||||
define UCLIBC_BINFMT_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
|
||||
#
|
||||
# ARC definitions
|
||||
#
|
||||
@@ -75,23 +113,46 @@ define UCLIBC_ARM_ABI_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI,$(@D)/.config)
|
||||
endef
|
||||
|
||||
# Thumb build is broken with threads, build in ARM mode
|
||||
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
|
||||
# Thumb1 build is broken with threads with old gcc versions (4.7 and
|
||||
# 4.8). Since all cores supporting Thumb1 also support ARM, we use ARM
|
||||
# code in this case.
|
||||
ifeq ($(BR2_GCC_VERSION_4_7_X)$(BR2_GCC_VERSION_4_8_X):$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_TOOLCHAIN_HAS_THREADS),y:yy)
|
||||
UCLIBC_EXTRA_CFLAGS += -marm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_UCLIBC_ARM_BX),y)
|
||||
define UCLIBC_ARM_BX_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,USE_BX,$(@D)/.config)
|
||||
ifeq ($(BR2_BINFMT_FLAT),y)
|
||||
define UCLIBC_ARM_BINFMT_FLAT
|
||||
$(call KCONFIG_DISABLE_OPT,DOPIC,$(@D)/.config)
|
||||
endef
|
||||
else
|
||||
define UCLIBC_ARM_BX_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,USE_BX,$(@D)/.config)
|
||||
endif
|
||||
|
||||
# context functions are written with ARM instructions. Therefore, if
|
||||
# we are using a Thumb2-only platform (i.e, Cortex-M), they must be
|
||||
# disabled. Thumb1 platforms are not a problem, since they all also
|
||||
# support the ARM instructions.
|
||||
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB2):$(BR2_ARM_CPU_HAS_ARM),y:)
|
||||
define UCLIBC_ARM_NO_CONTEXT_FUNCS
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_CONTEXT_FUNCS,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
|
||||
endif # arm
|
||||
|
||||
#
|
||||
# m68k/coldfire definitions
|
||||
#
|
||||
|
||||
ifeq ($(UCLIBC_TARGET_ARCH),m68k)
|
||||
|
||||
# disable DOPIC for flat without separate data
|
||||
ifeq ($(BR2_BINFMT_FLAT_ONE),y)
|
||||
define UCLIBC_M68K_BINFMT_FLAT
|
||||
$(call KCONFIG_DISABLE_OPT,DOPIC,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
|
||||
endif # m68k/coldfire
|
||||
|
||||
#
|
||||
# MIPS definitions
|
||||
#
|
||||
@@ -158,6 +219,15 @@ define UCLIBC_X86_TYPE_CONFIG
|
||||
endef
|
||||
endif
|
||||
|
||||
#
|
||||
# Debug
|
||||
#
|
||||
ifeq ($(BR2_ENABLE_DEBUG),y)
|
||||
define UCLIBC_DEBUG_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,DODEBUG,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
|
||||
#
|
||||
# Endianness
|
||||
#
|
||||
@@ -262,29 +332,19 @@ endif
|
||||
ifeq ($(BR2_PTHREADS_NONE),y)
|
||||
define UCLIBC_THREAD_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,LINUXTHREADS,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,LINUXTHREADS_OLD,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config)
|
||||
endef
|
||||
else ifeq ($(BR2_PTHREADS),y)
|
||||
define UCLIBC_THREAD_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,LINUXTHREADS_NEW,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,LINUXTHREADS_OLD,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config)
|
||||
endef
|
||||
else ifeq ($(BR2_PTHREADS_OLD),y)
|
||||
define UCLIBC_THREAD_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,LINUXTHREADS_NEW,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,LINUXTHREADS_OLD,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config)
|
||||
endef
|
||||
else ifeq ($(BR2_PTHREADS_NATIVE),y)
|
||||
define UCLIBC_THREAD_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,LINUXTHREADS_NEW,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,LINUXTHREADS_OLD,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config)
|
||||
endef
|
||||
endif
|
||||
@@ -359,16 +419,20 @@ define UCLIBC_KCONFIG_FIXUP_CMDS
|
||||
$(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr",$(@D)/.config)
|
||||
$(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib",$(@D)/.config)
|
||||
$(UCLIBC_MMU_CONFIG)
|
||||
$(UCLIBC_BINFMT_CONFIG)
|
||||
$(UCLIBC_ARC_TYPE_CONFIG)
|
||||
$(UCLIBC_ARC_PAGE_SIZE_CONFIG)
|
||||
$(UCLIBC_ARM_ABI_CONFIG)
|
||||
$(UCLIBC_ARM_BX_CONFIG)
|
||||
$(UCLIBC_ARM_BINFMT_FLAT)
|
||||
$(UCLIBC_ARM_NO_CONTEXT_FUNCS)
|
||||
$(UCLIBC_M68K_BINFMT_FLAT)
|
||||
$(UCLIBC_MIPS_ABI_CONFIG)
|
||||
$(UCLIBC_MIPS_ISA_CONFIG)
|
||||
$(UCLIBC_SH_TYPE_CONFIG)
|
||||
$(UCLIBC_SPARC_TYPE_CONFIG)
|
||||
$(UCLIBC_POWERPC_TYPE_CONFIG)
|
||||
$(UCLIBC_X86_TYPE_CONFIG)
|
||||
$(UCLIBC_DEBUG_CONFIG)
|
||||
$(UCLIBC_ENDIAN_CONFIG)
|
||||
$(UCLIBC_LARGEFILE_CONFIG)
|
||||
$(UCLIBC_IPV6_CONFIG)
|
||||
@@ -384,11 +448,11 @@ endef
|
||||
|
||||
ifeq ($(BR2_UCLIBC_INSTALL_TEST_SUITE),y)
|
||||
define UCLIBC_BUILD_TEST_SUITE
|
||||
$(MAKE1) -C $(@D) \
|
||||
$(MAKE) -C $(@D) \
|
||||
$(UCLIBC_MAKE_FLAGS) \
|
||||
TEST_INSTALLED_UCLIBC=1 \
|
||||
UCLIBC_ONLY=1 \
|
||||
test_compile
|
||||
test_compile test_gen
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -404,8 +468,7 @@ ifeq ($(BR2_UCLIBC_INSTALL_TEST_SUITE),y)
|
||||
define UCLIBC_INSTALL_TEST_SUITE
|
||||
mkdir -p $(TARGET_DIR)/root/uClibc
|
||||
cp -rdpf $(@D)/test $(TARGET_DIR)/root/uClibc
|
||||
$(INSTALL) -D -m 0644 $(@D)/Rules.mak $(TARGET_DIR)/root/uClibc/Rules.mak
|
||||
$(INSTALL) -D -m 0644 $(@D)/.config $(TARGET_DIR)/root/uClibc/.config
|
||||
find $(TARGET_DIR)/root/uClibc -name \*.o -exec rm {} \;
|
||||
endef
|
||||
endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user