Update buildroot from 17.02.2 -> 17.02.3
This commit is contained in:
@@ -28,7 +28,7 @@ config BR2_TOOLCHAIN_USES_MUSL
|
||||
select BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
|
||||
select BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
select BR2_TOOLCHAIN_SUPPORTS_PIE
|
||||
select BR2_TOOLCHAIN_SUPPORTS_PIE if !BR2_STATIC_LIBS
|
||||
|
||||
choice
|
||||
prompt "Toolchain type"
|
||||
|
||||
@@ -132,22 +132,12 @@ check_kernel_headers_version = \
|
||||
# $1: path to gcc
|
||||
# $2: expected gcc version
|
||||
#
|
||||
# Some details about the sed expression:
|
||||
# - 1!d
|
||||
# - delete if not line 1
|
||||
#
|
||||
# - s/^[^)]+\) ([^[:space:]]+).*/\1/
|
||||
# - eat all until the first ')' character followed by a space
|
||||
# - match as many non-space chars as possible
|
||||
# - eat all the remaining chars on the line
|
||||
# - replace by the matched expression
|
||||
#
|
||||
check_gcc_version = \
|
||||
expected_version="$(strip $2)" ; \
|
||||
if [ -z "$${expected_version}" ]; then \
|
||||
exit 0 ; \
|
||||
fi; \
|
||||
real_version=`$(1) --version | sed -r -e '1!d; s/^[^)]+\) ([^[:space:]]+).*/\1/;'` ; \
|
||||
real_version=`$(1) -dumpversion` ; \
|
||||
if [[ ! "$${real_version}" =~ ^$${expected_version}\. ]] ; then \
|
||||
printf "Incorrect selection of gcc version: expected %s.x, got %s\n" \
|
||||
"$${expected_version}" "$${real_version}" ; \
|
||||
|
||||
@@ -480,6 +480,8 @@ ifeq ($(BR2_i386),y)
|
||||
MUSL_ARCH = i386
|
||||
else ifeq ($(BR2_ARM_EABIHF),y)
|
||||
MUSL_ARCH = armhf
|
||||
else ifeq ($(BR2_mips):$(BR2_SOFT_FLOAT),y:y)
|
||||
MUSL_ARCH = mips-sf
|
||||
else ifeq ($(BR2_mipsel):$(BR2_SOFT_FLOAT),y:y)
|
||||
MUSL_ARCH = mipsel-sf
|
||||
else ifeq ($(BR2_sh),y)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SITE = http://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX)
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX)
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION = 2014.11-95
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SOURCE = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_ACTUAL_SOURCE_TARBALL = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION = 2014.05-29
|
||||
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SITE = http://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX)
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX)
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SOURCE = arm-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_ACTUAL_SOURCE_TARBALL = arm-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_VERSION = 2016.05-8
|
||||
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_SITE = http://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX)
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX)
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_SOURCE = mips-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_ACTUAL_SOURCE_TARBALL = mips-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION = 2016.11-32
|
||||
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SITE = http://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX)
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX)
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SOURCE = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2
|
||||
TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_ACTUAL_SOURCE_TARBALL = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2
|
||||
|
||||
|
||||
@@ -21,8 +21,10 @@ TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO
|
||||
# IFF_DORMANT and IFF_ECHO, add another macro to suppress them in the
|
||||
# kernel header, and avoid macro/enum conflict.
|
||||
#
|
||||
# Kernel version 3.12 introduced the libc-compat.h header.
|
||||
#
|
||||
# [1] http://www.openwall.com/lists/musl/2015/10/08/2
|
||||
ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
|
||||
ifeq ($(BR2_TOOLCHAIN_USES_MUSL)$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12),yy)
|
||||
define TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK
|
||||
$(SED) 's/^#if defined(__GLIBC__)$$/#if 1/' \
|
||||
$(STAGING_DIR)/usr/include/linux/libc-compat.h
|
||||
|
||||
Reference in New Issue
Block a user