merged with buildroot-2017.02 final

2025-07-24 11:46:30 +00:00 · 2017-03-10 22:09:41 +02:00 · 2017-03-10 22:09:41 +02:00 · 4d20ad0c86
commit 4d20ad0c86
parent 43ebc53c93
185 changed files with 1866 additions and 944 deletions
--- a/Config.in
+++ b/Config.in
@ -158,6 +158,13 @@ config BR2_XZCAT
 	  Command to be used to extract a xz'ed file to stdout.
 	  Default is "xzcat"

+config BR2_LZCAT
+	string "lzcat command"
+	default "lzip -d -c"
+	help
+	  Command to be used to extract a lzip'ed file to stdout.
+	  Default is "lzip -d -c"
+
 config BR2_TAR_OPTIONS
 	string "Tar options"
 	default ""
--- a/6
+++ b/6
@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O)
 all:

 # Set and export the version string
-export BR2_VERSION := 2017.02-rc1
+export BR2_VERSION := 2017.02
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1486825200
+BR2_VERSION_EPOCH = 1488315000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@ -402,6 +402,7 @@ unexport QMAKESPEC
 unexport TERMINFO
 unexport MACHINE
 unexport O
+unexport GCC_COLORS

 GNU_HOST_NAME := $(shell support/gnuconfig/config.guess)

@ -431,6 +432,7 @@ KERNEL_ARCH := $(shell echo "$(ARCH)" | sed -e "s/-.*//" \
 ZCAT := $(call qstrip,$(BR2_ZCAT))
 BZCAT := $(call qstrip,$(BR2_BZCAT))
 XZCAT := $(call qstrip,$(BR2_XZCAT))
+LZCAT := $(call qstrip,$(BR2_LZCAT))
 TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf

 # packages compiled for the host go here
--- a/linux/Config.in
+++ b/linux/Config.in
@ -26,7 +26,7 @@ choice
 	prompt "Kernel version"

 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "Latest version (4.9.9)"
+	bool "Latest version (4.9.13)"

 config BR2_LINUX_KERNEL_CUSTOM_VERSION
 	bool "Custom version"
@ -97,7 +97,7 @@ endif

 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "4.9.9" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "4.9.13" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
--- a/package/Config.in
+++ b/package/Config.in
@ -446,7 +446,6 @@ endmenu
 	source "package/read-edid/Config.in"
 	source "package/rfkill/Config.in"
 	source "package/rng-tools/Config.in"
-        source "package/rpi-armmem/Config.in"
 	source "package/rpi-userland/Config.in"
 	source "package/rs485conf/Config.in"
 	source "package/rtl8188eu/Config.in"
@ -698,7 +697,6 @@ menu "External python modules"
 	source "package/python-flask-jsonrpc/Config.in"
 	source "package/python-flask-login/Config.in"
 	source "package/python-flup/Config.in"
-	source "package/python-functools32/Config.in"
 	source "package/python-futures/Config.in"
 	source "package/python-gobject/Config.in"
 	source "package/python-gunicorn/Config.in"
@ -760,7 +758,6 @@ menu "External python modules"
 	source "package/python-pycli/Config.in"
 	source "package/python-pycparser/Config.in"
 	source "package/python-pycrypto/Config.in"
-	source "package/python-pycurl/Config.in"
 	source "package/python-pydal/Config.in"
 	source "package/python-pyelftools/Config.in"
 	source "package/python-pyftpdlib/Config.in"
@ -769,7 +766,6 @@ menu "External python modules"
 	source "package/python-pyicu/Config.in"
 	source "package/python-pyinotify/Config.in"
 	source "package/python-pylru/Config.in"
-	source "package/python-pymongo/Config.in"
 	source "package/python-pymysql/Config.in"
 	source "package/python-pynacl/Config.in"
 	source "package/python-pyopenssl/Config.in"
--- a/package/alsa-utils/Config.in
+++ b/package/alsa-utils/Config.in
@ -34,9 +34,6 @@ config BR2_PACKAGE_ALSA_UTILS_ALSALOOP
 config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
 	bool "alsamixer"
 	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_NCURSES_TARGET_PANEL
-	select BR2_PACKAGE_NCURSES_TARGET_FORM
-	select BR2_PACKAGE_NCURSES_TARGET_MENU
 	select BR2_PACKAGE_ALSA_LIB_MIXER
 	depends on BR2_USE_WCHAR
 	default y
--- a/package/assimp/Config.in
+++ b/package/assimp/Config.in
@ -4,11 +4,6 @@ config BR2_PACKAGE_ASSIMP
 	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71124, that
 	# cause an infinite loop in gcc when building this package.
 	depends on !BR2_microblaze
-	# The ADI Blackfin toolchain does not build assimp properly,
-	# fails with "internal compiler error: in simplify_subreg, at
-	# simplify-rtx.c:5001". It builds fine with a mainline gcc for
-	# Blackfin.
-	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_ZLIB
 	help
--- a/package/assimp/assimp.mk
+++ b/package/assimp/assimp.mk
@ -16,6 +16,14 @@ ifeq ($(BR2_m68k),y)
 ASSIMP_CXXFLAGS += -mxgot
 endif

+# workaround SuperH compiler failure when static linking (i.e -fPIC is
+# not passed) in gcc versions 5.x or older. The -Os optimization level
+# causes a "unable to find a register to spill in class
+# ‘GENERAL_REGS’" error. -O2 works fine.
+ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:)
+ASSIMP_CXXFLAGS += -O2
+endif
+
 ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \
 	-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)"

--- a/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch
+++ b/package/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch
@ -0,0 +1,49 @@
+From c0b3dbb43aa3a38c47311556c85eadc6072e2d68 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
+Date: Tue, 14 Feb 2017 22:02:26 +0100
+Subject: [PATCH] Fix Libs.private flags for mbedtls
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Static linking with bctoolbox fails when using pkg-config as the
+generated bctoolbox.pc file only consists of an '-L' string without any
+search path or libraries flags.
+
+That's because of an typo in `mbedtls_library_path`. However,
+`mbedtls_library_path` contains a string of the mbedtls libraries
+concatenated by an ';' which cannot be parsed by pkg-config.
+
+Therefore, use `MBEDTLS_LIBRARY` instead of `MBEDTLS_LIBRARIES` to get
+the library path.
+
+Furthermore, add the three mbedtls libraries *mbedtls*, *mbedcrypto*, and
+*mbedx509* to `LIBS_PRIVATE` so these libraries are added to the
+`Libs.private` field of bctoolbox.pc.
+
+Upstream status: Pending
+https://github.com/BelledonneCommunications/bctoolbox/pull/4
+
+Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ed7aa00..4127f0e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -103,8 +103,8 @@ else()
+ endif()
+ 
+ if(MBEDTLS_FOUND)
+-	get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARIES}" PATH)
+-	set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedlts_library_path}")
+	get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARY}" PATH)
+	set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedtls_library_path} -lmbedtls -lmbedcrypto -lmbedx509")
+ endif()
+ if(POLARSSL_FOUND)
+ 	get_filename_component(polarssl_library_path "${POLARSSL_LIBRARIES}" PATH)
+-- 
+2.11.1
+
--- a/package/bctoolbox/Config.in
+++ b/package/bctoolbox/Config.in
@ -2,11 +2,13 @@ config BR2_PACKAGE_BCTOOLBOX
 	bool "bctoolbox"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_PACKAGE_MBEDTLS # mbedtls is preferred over polarssl
 	help
 	  Utilities library used by Belledonne Communications
 	  softwares like belle-sip, mediastreamer2 and linphone.

+	  Select BR2_PACKAGE_MBEDTLS (preferred) or
+	  BR2_PACKAGE_POLARSSL for crypto support.
+
 	  https://github.com/BelledonneCommunications/bctoolbox

 comment "bctoolbox needs a toolchain w/ C++, threads"
--- a/package/bctoolbox/bctoolbox.mk
+++ b/package/bctoolbox/bctoolbox.mk
@ -8,14 +8,32 @@ BCTOOLBOX_VERSION = 0.4.0
 BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION))
 BCTOOLBOX_LICENSE = GPLv2+
 BCTOOLBOX_LICENSE_FILES = COPYING
-BCTOOLBOX_DEPENDENCIES = mbedtls
 BCTOOLBOX_INSTALL_STAGING = YES

+# Set CMAKE_SKIP_RPATH to prevent bctoolbox from adding the rpath to
+# shared library.
 BCTOOLBOX_CONF_OPTS = \
 	-DENABLE_STRICT=OFF \
 	-DENABLE_TESTS_COMPONENT=OFF \
 	-DENABLE_TESTS=OFF \
-	-DGIT_EXECUTABLE=OFF
+	-DGIT_EXECUTABLE=OFF \
+	-DCMAKE_SKIP_RPATH=ON
+
+# bctoolbox can be build with mbedTLS or PolarSSL support. If both
+# libraries are present, mbedTLS is preferred over PolarSSL.
+ifeq ($(BR2_PACKAGE_MBEDTLS),y)
+BCTOOLBOX_DEPENDENCIES += mbedtls
+BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=ON
+else
+BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_POLARSSL),y)
+BCTOOLBOX_DEPENDENCIES += polarssl
+BCTOOLBOX_CONF_OPTS += -DENABLE_POLARSSL=ON
+else
+BCTOOLBOX_CONF_OPTS += -DENABLE_POLARSSL=OFF
+endif

 ifeq ($(BR2_STATIC_LIBS),y)
 BCTOOLBOX_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@ -20,11 +20,18 @@ BERKELEYDB_BINARIES = db_archive db_checkpoint db_deadlock db_dump \
 	db_hotbackup db_load db_log_verify db_printlog db_recover db_replicate \
 	db_stat db_tuner db_upgrade db_verify

+# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
+ifeq ($(BR2_m68k_cf),y)
+BERKELEYDB_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm"
+endif
+
 # build directory can't be the directory where configure are there, so..
 define BERKELEYDB_CONFIGURE_CMDS
 	(cd $(@D)/build_unix; rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
+		$(BERKELEYDB_CONF_ENV) \
 		../dist/configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
--- a/package/bind/bind.hash
+++ b/package/bind/bind.hash
@ -1,2 +1,2 @@
-# Verified from http://ftp.isc.org/isc/bind9/9.11.0-P2/bind-9.11.0-P2.tar.gz.sha256.asc
-sha256 d651f83ce1c08c83d6ac8201685c4f2b5fdb79794f3a4f93c3948e0ef439c1e5  bind-9.11.0-P2.tar.gz
+# Verified from http://ftp.isc.org/isc/bind9/9.11.0-P3/bind-9.11.0-P3.tar.gz.sha256.asc
+sha256 0feee0374bcbdee73a9d4277f3c5007622279572d520d7c27a4b64015d8ca9e9  bind-9.11.0-P3.tar.gz
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-BIND_VERSION = 9.11.0-P2
+BIND_VERSION = 9.11.0-P3
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 # bind does not support parallel builds.
 BIND_MAKE = $(MAKE1)
--- a/package/binutils/2.25.1/916-microblaze-pr21180.patch
+++ b/package/binutils/2.25.1/916-microblaze-pr21180.patch
@ -0,0 +1,33 @@
+Fix ld segfault for microblaze when --gc-sections is used
+Upstream: pending
+https://sourceware.org/bugzilla/show_bug.cgi?id=21180
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+diff -Nur binutils-2.25.1.orig/bfd/elf32-microblaze.c binutils-2.25.1/bfd/elf32-microblaze.c
+--- binutils-2.25.1.orig/bfd/elf32-microblaze.c	2015-07-21 10:20:58.000000000 +0200
+++ binutils-2.25.1/bfd/elf32-microblaze.c	2017-02-23 19:43:24.560776208 +0100
+@@ -3297,13 +3297,20 @@
+           && h->def_regular)
+         {
+           asection *sec = h->root.u.def.section;
+	  bfd_vma value;
+
+	  value = h->root.u.def.value;
+	  if (sec->output_section != NULL)
+	    /* PR 21180: If the output section is NULL, then the symbol is no
+	       longer needed, and in theory the GOT entry is redundant.  But
+	       it is too late to change our minds now...  */
+	    value += sec->output_section->vma + sec->output_offset;
+
+           microblaze_elf_output_dynamic_relocation (output_bfd,
+                                                     srela, srela->reloc_count++,
+                                                     /* symindex= */ 0,
+                                                     R_MICROBLAZE_REL, offset,
+-                                                    h->root.u.def.value
+-                                                    + sec->output_section->vma
+-                                                    + sec->output_offset);
+                                                    value);
+         }
+       else
+         {
--- a/package/binutils/2.26.1/0906-microblaze-pr21180.patch
+++ b/package/binutils/2.26.1/0906-microblaze-pr21180.patch
@ -0,0 +1,33 @@
+Fix ld segfault for microblaze when --gc-sections is used
+Upstream: pending
+https://sourceware.org/bugzilla/show_bug.cgi?id=21180
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+diff -Nur binutils-2.26.1.orig/bfd/elf32-microblaze.c binutils-2.26.1/bfd/elf32-microblaze.c
+--- binutils-2.26.1.orig/bfd/elf32-microblaze.c	2015-11-13 09:27:40.000000000 +0100
+++ binutils-2.26.1/bfd/elf32-microblaze.c	2017-02-23 19:43:18.536542964 +0100
+@@ -3300,13 +3300,20 @@
+           && h->def_regular)
+         {
+           asection *sec = h->root.u.def.section;
+	  bfd_vma value;
+
+	  value = h->root.u.def.value;
+	  if (sec->output_section != NULL)
+	    /* PR 21180: If the output section is NULL, then the symbol is no
+	       longer needed, and in theory the GOT entry is redundant.  But
+	       it is too late to change our minds now...  */
+	    value += sec->output_section->vma + sec->output_offset;
+
+           microblaze_elf_output_dynamic_relocation (output_bfd,
+                                                     srela, srela->reloc_count++,
+                                                     /* symindex= */ 0,
+                                                     R_MICROBLAZE_REL, offset,
+-                                                    h->root.u.def.value
+-                                                    + sec->output_section->vma
+-                                                    + sec->output_offset);
+                                                    value);
+         }
+       else
+         {
--- a/package/binutils/2.27/0906-microblaze-pr21180.patch
+++ b/package/binutils/2.27/0906-microblaze-pr21180.patch
@ -0,0 +1,33 @@
+Fix ld segfault for microblaze when --gc-sections is used
+Upstream: pending
+https://sourceware.org/bugzilla/show_bug.cgi?id=21180
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+diff -Nur binutils-2.27.orig/bfd/elf32-microblaze.c binutils-2.27/bfd/elf32-microblaze.c
+--- binutils-2.27.orig/bfd/elf32-microblaze.c	2016-08-03 09:36:50.000000000 +0200
+++ binutils-2.27/bfd/elf32-microblaze.c	2017-02-23 19:43:12.612313590 +0100
+@@ -3297,13 +3297,20 @@
+ 	      || h->dynindx == -1))
+         {
+           asection *sec = h->root.u.def.section;
+	  bfd_vma value;
+
+	  value = h->root.u.def.value;
+	  if (sec->output_section != NULL)
+	    /* PR 21180: If the output section is NULL, then the symbol is no
+	       longer needed, and in theory the GOT entry is redundant.  But
+	       it is too late to change our minds now...  */
+	    value += sec->output_section->vma + sec->output_offset;
+
+           microblaze_elf_output_dynamic_relocation (output_bfd,
+                                                     srela, srela->reloc_count++,
+                                                     /* symindex= */ 0,
+                                                     R_MICROBLAZE_REL, offset,
+-                                                    h->root.u.def.value
+-                                                    + sec->output_section->vma
+-                                                    + sec->output_offset);
+                                                    value);
+         }
+       else
+         {
--- a/package/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch
+++ b/package/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch
@ -0,0 +1,42 @@
+From 1fc5444f5620670bb9d293be4f92df59661e1810 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Mon, 20 Feb 2017 23:31:24 +0100
+Subject: [PATCH] kerncompat.h: define BTRFS_DISABLE_BACKTRACE when building
+ with uClibc
+
+uClibc does not provide backtrace() nor <execinfo.h>. When building
+btrfs-progs, passing --disable-backtrace is enough to make it build with
+uClibc. But once btrfs-progs is installed and another program/library
+includes kerncompat.h, it fails to build with uClibc, because
+BTRFS_DISABLE_BACKTRACE is not defined.
+
+The most correct fix for this would be to have kerncompat.h generated
+from kerncompat.h.in during the btrfs-progs build process, and tuned
+depending on autoconf/automake variables. But as a quick fix that
+follows the current strategy, we simply tweak the existing __GLIBC__
+conditional. Indeed, uClibc pretends to be glibc and defines __GLIBC__,
+but it does not replace it completely, hence the need to define
+BTRFS_DISABLE_BACKTRACE when __GLIBC__ is not defined *or* when
+__UCLIBC__ is defined.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ kerncompat.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kerncompat.h b/kerncompat.h
+index 0f207b7..e47d164 100644
+--- a/kerncompat.h
+++ b/kerncompat.h
+@@ -32,7 +32,7 @@
+ 
+ #include <features.h>
+ 
+-#ifndef __GLIBC__
+#if !defined(__GLIBC__) || defined(__UCLIBC__)
+ #ifndef BTRFS_DISABLE_BACKTRACE
+ #define BTRFS_DISABLE_BACKTRACE
+ #endif
+-- 
+2.7.4
+
--- a/package/cannelloni/0001-Add-missing-cstdio-include.patch
+++ b/package/cannelloni/0001-Add-missing-cstdio-include.patch
@ -0,0 +1,29 @@
+From d41f5ec6bb66654558757c3ef9cd2a158ee06ccc Mon Sep 17 00:00:00 2001
+From: Yegor Yefremov <yegorslists@googlemail.com>
+Date: Wed, 15 Feb 2017 09:29:29 +0100
+Subject: [PATCH] Add missing <cstdio> include
+
+This header defines EOF macro. Some toolchains cannot
+find this macro, if <cstdio> is missing. So include it
+explicitly.
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+---
+ sctpthread.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sctpthread.cpp b/sctpthread.cpp
+index 6c83fed..d83b472 100644
+--- a/sctpthread.cpp
+++ b/sctpthread.cpp
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <chrono>
+#include <cstdio>
+ #include <algorithm>
+ 
+ #include <string.h>
+-- 
+2.1.4
+
--- a/package/cbootimage/Config.in
+++ b/package/cbootimage/Config.in
@ -1,9 +1,16 @@
 config BR2_PACKAGE_CBOOTIMAGE
 	bool "cbootimage"
 	depends on BR2_arm || BR2_armeb
+	# uses non-standard u_intXX_t types
+	# https://github.com/NVIDIA/cbootimage/pull/7
+	depends on !BR2_TOOLCHAIN_USES_MUSL
 	help
 	  This project provides a tool which compiles BCT (Boot
 	  Configuration Table) images to place into the boot flash of
 	  a Tegra-based device.

 	  https://github.com/NVIDIA/cbootimage
+
+comment "cbootimage needs a glibc or uClibc toolchain"
+	depends on BR2_arm || BR2_armeb
+	depends on BR2_TOOLCHAIN_USES_MUSL
--- a/package/classpath/Config.in
+++ b/package/classpath/Config.in
@ -1,8 +1,15 @@
+config BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
+	bool
+	default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k \
+		|| BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \
+		|| BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le \
+		|| BR2_sh || BR2_x86_64
+
 config BR2_PACKAGE_CLASSPATH
 	bool "classpath"
 	select BR2_NEEDS_HOST_JAR
 	select BR2_NEEDS_HOST_JAVAC
-	depends on BR2_PACKAGE_JAMVM
+	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	help
 	  GNU Classpath, Essential Libraries for Java, is a GNU
 	  project to create free core class libraries for use with
--- a/package/cmake/Config.in
+++ b/package/cmake/Config.in
@ -20,14 +20,11 @@ config BR2_PACKAGE_CMAKE_CTEST
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_XZ
-	select BR2_PACKAGE_LIBUV
 	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp
 	depends on BR2_USE_WCHAR # libarchive
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_STATIC_LIBS
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
-	depends on BR2_USE_MMU # libuv
 	help
 	  CTest is a testing tool distributed as a part of CMake. It
 	  can be used to automate updating (using CVS for example),
@ -37,9 +34,7 @@ config BR2_PACKAGE_CMAKE_CTEST

 	  http://www.cmake.org/

-comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, NPTL"
+comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7"
 	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
-	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-		BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
-		!BR2_TOOLCHAIN_HAS_THREADS_NPTL
+		BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
--- a/package/cmake/cmake.hash
+++ b/package/cmake/cmake.hash
@ -1,2 +1,2 @@
-# From http://www.cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt
-sha256 dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0  cmake-3.7.2.tar.gz
+# From http://www.cmake.org/files/v3.6/cmake-3.6.3-SHA-256.txt
+sha256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe  cmake-3.6.3.tar.gz
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@ -4,8 +4,8 @@
 #
 ################################################################################

-CMAKE_VERSION_MAJOR = 3.7
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
+CMAKE_VERSION_MAJOR = 3.6
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3
 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
 CMAKE_LICENSE = BSD-3c
 CMAKE_LICENSE_FILES = Copyright.txt
@ -22,7 +22,7 @@ CMAKE_LICENSE_FILES = Copyright.txt
 #   the system-wide libraries instead of rebuilding and statically
 #   linking with the ones bundled into the CMake sources.

-CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz libuv
+CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz

 CMAKE_CONF_OPTS = \
 	-DKWSYS_LFS_WORKS=TRUE \
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@ -526,6 +526,7 @@ config BR2_PACKAGE_COLLECTD_GRAPHITE

 config BR2_PACKAGE_COLLECTD_MQTT
 	bool "mqtt"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto
 	select BR2_PACKAGE_MOSQUITTO
 	help
 	  Sends metrics to and/or receives metrics from an MQTT broker.
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@ -7,7 +7,7 @@
 CUPS_VERSION = 2.2.2
 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
 CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)
-CUPS_LICENSE = GPLv2 LGPLv2
+CUPS_LICENSE = GPLv2, LGPLv2
 CUPS_LICENSE_FILES = LICENSE.txt
 CUPS_INSTALL_STAGING = YES
 CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
@ -28,6 +28,7 @@ CUPS_CONF_OPTS = \
 CUPS_CONFIG_SCRIPTS = cups-config
 CUPS_DEPENDENCIES = \
 	host-autoconf \
+	host-pkgconf \
 	$(if $(BR2_PACKAGE_ZLIB),zlib)

 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
--- a/package/dbus/dbus.hash
+++ b/package/dbus/dbus.hash
@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	23238f70353e38ce5ca183ebc9525c0d97ac00ef640ad29cf794782af6e6a083  dbus-1.10.14.tar.gz
+sha256	a7b0ba6ea3e8d0e08afec5e3030d0245614268276620c536726f8fa6e5c43388  dbus-1.10.16.tar.gz
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-DBUS_VERSION = 1.10.14
+DBUS_VERSION = 1.10.16
 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus
 DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools)
 DBUS_LICENSE_FILES = COPYING
--- a/package/ddrescue/0001-io.cc-add-stdio.h-include.patch
+++ b/package/ddrescue/0001-io.cc-add-stdio.h-include.patch
@ -0,0 +1,36 @@
+From 0f72787b922c53c33d497b17300a959b911e621f Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Tue, 14 Feb 2017 20:12:05 +0100
+Subject: [PATCH] io.cc: add stdio.h include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes buildroot compile failure with uclibc [1]:
+
+  In file included from io.cc:28:0:
+  block.h:219:22: error: ‘FILE’ has not been declared
+     int write_mapfile( FILE * f = 0, const bool timestamp = false,
+
+[1] http://autobuild.buildroot.net/results/4ac0754f1cc5ea934d6437e89d1f4906fb3fd0a8
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ io.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/io.cc b/io.cc
+index 36b8341..2d6a76e 100644
+--- a/io.cc
+++ b/io.cc
+@@ -23,6 +23,7 @@
+ #include <string>
+ #include <vector>
+ #include <stdint.h>
+#include <stdio.h>
+ #include <unistd.h>
+ 
+ #include "block.h"
+-- 
+2.11.0
+
--- a/package/ddrescue/ddrescue.mk
+++ b/package/ddrescue/ddrescue.mk
@ -9,12 +9,6 @@ DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz
 DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue
 DDRESCUE_LICENSE = GPLv2+
 DDRESCUE_LICENSE_FILES = COPYING
-DDRESCUE_DEPENDENCIES = host-lzip
-
-define DDRESCUE_EXTRACT_CMDS
-	$(HOST_DIR)/usr/bin/lzip -d -c $(DL_DIR)/$(DDRESCUE_SOURCE) | \
-		tar --strip-components=1 -C $(@D) $(TAR_OPTIONS) -
-endef

 define DDRESCUE_CONFIGURE_CMDS
 	(cd $(@D); \
--- a/package/directfb/0006-fix-client-gfx_state-initialisation.patch
+++ b/package/directfb/0006-fix-client-gfx_state-initialisation.patch
@ -0,0 +1,39 @@
+From 8e53c0b9cedb62b82e2b7680d793d433b647ae20 Mon Sep 17 00:00:00 2001
+From: Andre McCurdy <armccurdy@gmail.com>
+Date: Mon, 13 Jun 2016 13:32:44 -0700
+Subject: [PATCH] fix client->gfx_state initialisation
+
+Shortly before the DirectFB 1.7.7 release, an optimisation was added
+to CoreGraphicsStateClient_Init() to avoid creating an extended
+Graphics State object if it will not later be required:
+
+  4d422fb Client: Create extended Graphics State object when needed for later usage
+
+Unfortunately the client->gfx_state variable used to track the
+extended Graphics State object is not initialised, which can lead to
+crashes etc due to creation of the Graphics State object erroneously
+being skipped.
+
+Upstream-Status: Pending
+
+Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+Signed-off-by: Philippe Reynes <philippe.reynes@sagemcom.com>
+---
+ src/core/CoreGraphicsStateClient.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/core/CoreGraphicsStateClient.cpp b/src/core/CoreGraphicsStateClient.cpp
+index 5d46f0e..5007755 100644
+--- a/src/core/CoreGraphicsStateClient.cpp
+++ b/src/core/CoreGraphicsStateClient.cpp
+@@ -364,6 +364,7 @@ CoreGraphicsStateClient_Init( CoreGraphicsStateClient *client,
+      client->renderer  = NULL;
+      client->requestor = NULL;
+      client->throttle  = NULL;
+     client->gfx_state = NULL;
+ 
+      if (dfb_config->task_manager) {
+           if (dfb_config->call_nodirect) {
+-- 
+1.9.1
+
--- a/package/directfb/Config.in
+++ b/package/directfb/Config.in
@ -1,5 +1,6 @@
 config BR2_PACKAGE_DIRECTFB
 	bool "directfb"
+	depends on !BR2_STATIC_LIBS # static link issues
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
@ -161,7 +162,8 @@ config BR2_PACKAGE_DIRECTFB_TESTS

 endif # BR2_PACKAGE_DIRECTFB

-comment "directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5"
+comment "directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5, dynamic library"
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || BR2_TOOLCHAIN_USES_MUSL
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || BR2_TOOLCHAIN_USES_MUSL || \
+		BR2_STATIC_LIBS
--- a/package/domoticz/Config.in
+++ b/package/domoticz/Config.in
@ -1,6 +1,7 @@
 config BR2_PACKAGE_DOMOTICZ
 	bool "domoticz"
 	depends on BR2_USE_MMU # mosquitto
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto
 	depends on !BR2_STATIC_LIBS # mosquitto
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
@ -28,6 +29,7 @@ config BR2_PACKAGE_DOMOTICZ

 comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, threads, wchar, dynamic library"
 	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_USE_WCHAR || BR2_STATIC_LIBS || \
--- a/package/duma/duma.mk
+++ b/package/duma/duma.mk
@ -7,7 +7,7 @@
 DUMA_VERSION = 2.5.15
 DUMA_SOURCE = duma_$(subst .,_,$(DUMA_VERSION)).tar.gz
 DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/$(DUMA_VERSION)
-DUMA_LICENSE = GPLv2+ LGPLv2.1+
+DUMA_LICENSE = GPLv2+, LGPLv2.1+
 DUMA_LICENSE_FILES = COPYING-GPL COPYING-LGPL

 DUMA_INSTALL_STAGING = YES
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@ -7,7 +7,7 @@
 E2FSPROGS_VERSION = 1.43.3
 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
 E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
-E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause
+E2FSPROGS_LICENSE = GPLv2, BSD-3c (libuuid), MIT-like with advertising clause (libss and libet)
 E2FSPROGS_LICENSE_FILES = NOTICE lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
 E2FSPROGS_INSTALL_STAGING = YES
 E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@ -10,15 +10,9 @@ ED_SOURCE = ed-$(ED_VERSION).tar.lz
 ED_CONF_OPTS = \
 	CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)"
-ED_DEPENDENCIES = host-lzip
 ED_LICENSE = GPLv3+
 ED_LICENSE_FILES = COPYING

-define ED_EXTRACT_CMDS
-	$(HOST_DIR)/usr/bin/lzip -d -c $(DL_DIR)/$(ED_SOURCE) | \
-		tar --strip-components=1 -C $(@D) $(TAR_OPTIONS) -
-endef
-
 define ED_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_MAKE_ENV) ./configure \
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@ -30,6 +30,12 @@ ERLANG_CONF_ENV += erl_xcomp_sysroot=$(STAGING_DIR)

 ERLANG_CONF_OPTS = --without-javac

+# Force ERL_TOP to the downloaded source directory. This prevents
+# Erlang's configure script from inadvertantly using files from
+# a version of Erlang installed on the host.
+ERLANG_CONF_ENV += ERL_TOP=$(@D)
+HOST_ERLANG_CONF_ENV += ERL_TOP=$(@D)
+
 # erlang uses openssl for all things crypto. Since the host tools (such as
 # rebar) uses crypto, we need to build host-erlang with support for openssl.
 HOST_ERLANG_DEPENDENCIES = host-openssl
--- a/package/file/file.mk
+++ b/package/file/file.mk
@ -10,7 +10,7 @@ FILE_DEPENDENCIES = host-file zlib
 HOST_FILE_DEPENDENCIES = host-zlib
 FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 FILE_INSTALL_STAGING = YES
-FILE_LICENSE = BSD-2c, one file BSD-4c, one file BSD-3c
+FILE_LICENSE = BSD-2c, BSD-4c (one file), BSD-3c (one file)
 FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c

 $(eval $(autotools-package))
--- a/package/gcc/musl-5.4.0/100-uclibc-conf.patch
+++ b/package/gcc/musl-5.4.0/100-uclibc-conf.patch
@ -0,0 +1,15 @@
+Index: b/contrib/regression/objs-gcc.sh
+===================================================================
+--- a/contrib/regression/objs-gcc.sh
+++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
+ then
+  make all-gdb all-dejagnu all-ld || exit 1
+  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
--- a/package/gcc/musl-5.4.0/301-missing-execinfo_h.patch
+++ b/package/gcc/musl-5.4.0/301-missing-execinfo_h.patch
@ -0,0 +1,13 @@
+Index: b/boehm-gc/include/gc.h
+===================================================================
+--- a/boehm-gc/include/gc.h
+++ b/boehm-gc/include/gc.h
+@@ -503,7 +503,7 @@
+ #if defined(__linux__) || defined(__GLIBC__)
+ # include <features.h>
+ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
+-     && !defined(__ia64__)
+     && !defined(__ia64__) && !defined(__UCLIBC__)
+ #   ifndef GC_HAVE_BUILTIN_BACKTRACE
+ #     define GC_HAVE_BUILTIN_BACKTRACE
+ #   endif
--- a/package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch
+++ b/package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch
@ -0,0 +1,273 @@
+Allow C99-depending features of libstdc++ with uClibc
+
+The libstdc++ code is fairly restrictive on how it checks for C99
+compatibility: it requires *complete* C99 support to enable certain
+features. For example, uClibc provides a good number of C99 features,
+but not C99 complex number support. For this reason, libstdc++
+completely disables many the standard C++ methods that can in fact
+work because uClibc provides the necessary functions.
+
+This patch is similar and highly inspired from
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in
+a way that doesn't involve changing the configure.ac script, as
+autoreconfiguring gcc is complicated. It simply relies on the fact
+that uClibc defines the __UCLIBC__ definition.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/libstdc++-v3/config/locale/generic/c_locale.h
+===================================================================
+--- a/libstdc++-v3/config/locale/generic/c_locale.h
+++ b/libstdc++-v3/config/locale/generic/c_locale.h
+@@ -70,7 +70,7 @@
+     __builtin_va_list __args;
+     __builtin_va_start(__args, __fmt);
+ 
+-#ifdef _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
+ #else
+     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
+Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
+===================================================================
+--- a/libstdc++-v3/config/locale/gnu/c_locale.h
+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
+@@ -88,7 +88,7 @@
+     __builtin_va_list __args;
+     __builtin_va_start(__args, __fmt);
+ 
+-#ifdef _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
+ #else
+     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
+Index: b/libstdc++-v3/include/bits/basic_string.h
+===================================================================
+--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
+@@ -5239,7 +5239,7 @@
+ _GLIBCXX_END_NAMESPACE_VERSION
+ } // namespace
+ 
+-#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99)
+#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))
+ 
+ #include <ext/string_conversions.h>
+ 
+Index: b/libstdc++-v3/include/bits/locale_facets.tcc
+===================================================================
+--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
+@@ -992,7 +992,7 @@
+ 	char __fbuf[16];
+ 	__num_base::_S_format_float(__io, __fbuf, __mod);
+ 
+-#ifdef _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+ 	// Precision is always used except for hexfloat format.
+ 	const bool __use_prec =
+ 	  (__io.flags() & ios_base::floatfield) != ios_base::floatfield;
+Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
+===================================================================
+--- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
+@@ -578,7 +578,7 @@
+     {
+       const locale __loc = __io.getloc();
+       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
+-#ifdef _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+       // First try a buffer perhaps big enough.
+       int __cs_size = 64;
+       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
+Index: b/libstdc++-v3/include/c_compatibility/math.h
+===================================================================
+--- a/libstdc++-v3/include/c_compatibility/math.h
+++ b/libstdc++-v3/include/c_compatibility/math.h
+@@ -56,7 +56,7 @@
+ using std::floor;
+ using std::fmod;
+ 
+-#if _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+ using std::fpclassify;
+ using std::isfinite;
+ using std::isinf;
+Index: b/libstdc++-v3/include/c_compatibility/wchar.h
+===================================================================
+--- a/libstdc++-v3/include/c_compatibility/wchar.h
+++ b/libstdc++-v3/include/c_compatibility/wchar.h
+@@ -103,7 +103,7 @@
+ using std::wmemset;
+ using std::wcsftime;
+ 
+-#if _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+ using std::wcstold;
+ using std::wcstoll;
+ using std::wcstoull;
+Index: b/libstdc++-v3/include/c_global/cstdlib
+===================================================================
+--- a/libstdc++-v3/include/c_global/cstdlib
+++ b/libstdc++-v3/include/c_global/cstdlib
+@@ -195,7 +195,7 @@
+ _GLIBCXX_END_NAMESPACE_VERSION
+ } // namespace
+ 
+-#if _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+ 
+ #undef _Exit
+ #undef llabs
+Index: b/libstdc++-v3/include/c_global/cwchar
+===================================================================
+--- a/libstdc++-v3/include/c_global/cwchar
+++ b/libstdc++-v3/include/c_global/cwchar
+@@ -232,7 +232,7 @@
+ _GLIBCXX_END_NAMESPACE_VERSION
+ } // namespace
+ 
+-#if _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+ 
+ #undef wcstold
+ #undef wcstoll
+@@ -289,7 +289,7 @@
+   using std::vwscanf;
+ #endif
+ 
+-#if _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+   using std::wcstold;
+   using std::wcstoll;
+   using std::wcstoull;
+Index: b/libstdc++-v3/include/c_std/cstdio
+===================================================================
+--- a/libstdc++-v3/include/c_std/cstdio
+++ b/libstdc++-v3/include/c_std/cstdio
+@@ -144,7 +144,7 @@
+   using ::vsprintf;
+ } // namespace std
+ 
+-#if _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+ 
+ #undef snprintf
+ #undef vfscanf
+Index: b/libstdc++-v3/include/c_std/cstdlib
+===================================================================
+--- a/libstdc++-v3/include/c_std/cstdlib
+++ b/libstdc++-v3/include/c_std/cstdlib
+@@ -192,7 +192,7 @@
+ _GLIBCXX_END_NAMESPACE_VERSION
+ } // namespace
+ 
+-#if _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+ 
+ #undef _Exit
+ #undef llabs
+Index: b/libstdc++-v3/include/c_std/cwchar
+===================================================================
+--- a/libstdc++-v3/include/c_std/cwchar
+++ b/libstdc++-v3/include/c_std/cwchar
+@@ -228,7 +228,7 @@
+ _GLIBCXX_END_NAMESPACE_VERSION
+ } // namespace
+ 
+-#if _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+ 
+ #undef wcstold
+ #undef wcstoll
+Index: b/libstdc++-v3/include/ext/vstring.h
+===================================================================
+--- a/libstdc++-v3/include/ext/vstring.h
+++ b/libstdc++-v3/include/ext/vstring.h
+@@ -2680,7 +2680,7 @@
+ _GLIBCXX_END_NAMESPACE_VERSION
+ } // namespace
+ 
+-#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99))
+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)))
+ 
+ #include <ext/string_conversions.h>
+ 
+Index: b/libstdc++-v3/include/tr1/cstdio
+===================================================================
+--- a/libstdc++-v3/include/tr1/cstdio
+++ b/libstdc++-v3/include/tr1/cstdio
+@@ -33,7 +33,7 @@
+ 
+ #include <cstdio>
+ 
+-#if _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+ 
+ namespace std _GLIBCXX_VISIBILITY(default)
+ {
+Index: b/libstdc++-v3/include/tr1/cstdlib
+===================================================================
+--- a/libstdc++-v3/include/tr1/cstdlib
+++ b/libstdc++-v3/include/tr1/cstdlib
+@@ -35,7 +35,7 @@
+ 
+ #if _GLIBCXX_HOSTED
+ 
+-#if _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+ 
+ namespace std _GLIBCXX_VISIBILITY(default)
+ {
+Index: b/libstdc++-v3/include/tr1/cwchar
+===================================================================
+--- a/libstdc++-v3/include/tr1/cwchar
+++ b/libstdc++-v3/include/tr1/cwchar
+@@ -52,7 +52,7 @@
+   using std::vwscanf;
+ #endif
+ 
+-#if _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+   using std::wcstold;
+   using std::wcstoll;
+   using std::wcstoull;
+Index: b/libstdc++-v3/include/tr1/stdlib.h
+===================================================================
+--- a/libstdc++-v3/include/tr1/stdlib.h
+++ b/libstdc++-v3/include/tr1/stdlib.h
+@@ -33,7 +33,7 @@
+ 
+ #if _GLIBCXX_HOSTED
+ 
+-#if _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+ 
+ using std::tr1::atoll;
+ using std::tr1::strtoll;
+Index: b/libstdc++-v3/src/c++11/debug.cc
+===================================================================
+--- a/libstdc++-v3/src/c++11/debug.cc
+++ b/libstdc++-v3/src/c++11/debug.cc
+@@ -788,7 +788,7 @@
+ 				     int __n __attribute__ ((__unused__)), 
+ 				     const char* __fmt, _Tp __s) const throw ()
+     {
+-#ifdef _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+       std::snprintf(__buf, __n, __fmt, __s);
+ #else
+       std::sprintf(__buf, __fmt, __s);
+Index: b/libstdc++-v3/include/c_global/cstdio
+===================================================================
+--- a/libstdc++-v3/include/c_global/cstdio
+++ b/libstdc++-v3/include/c_global/cstdio
+@@ -146,7 +146,7 @@
+   using ::vsprintf;
+ } // namespace
+ 
+-#if _GLIBCXX_USE_C99
+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
+ 
+ #undef snprintf
+ #undef vfscanf
--- a/package/gcc/musl-5.4.0/860-cilk-wchar.patch
+++ b/package/gcc/musl-5.4.0/860-cilk-wchar.patch
@ -0,0 +1,56 @@
+[PATCH] cilk: fix build without wchar
+
+When building against uClibc with wchar support disabled, WCHAR_MIN and
+WCHAR_MAX are not defined leading to compilation errors.
+
+Fix it by only including the wchar code if available.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+Index: b/libcilkrts/include/cilk/reducer_min_max.h
+===================================================================
+--- a/libcilkrts/include/cilk/reducer_min_max.h
+++ b/libcilkrts/include/cilk/reducer_min_max.h
+@@ -3154,7 +3154,9 @@
+ CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
+ CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
+ CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
+#ifdef WCHAR_MIN
+ CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
+#endif
+ CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
+ CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
+ CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
+@@ -3306,7 +3308,9 @@
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
+#ifdef WCHAR_MIN
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
+#endif
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
+@@ -3432,7 +3436,9 @@
+ CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
+#ifdef WCHAR_MAX
+ CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
+#endif
+ CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
+@@ -3584,7 +3590,9 @@
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
+#ifdef WCHAR_MAX
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
+#endif
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
--- a/package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch
+++ b/package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch
@ -0,0 +1,14 @@
+disable split-stack for non-thread builds
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack
+--- gcc-5.3.0.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
+++ gcc-5.3.0/libgcc/config/t-stack	2016-03-07 03:25:32.000000000 +0100
+@@ -1,4 +1,6 @@
+ # Makefile fragment to provide generic support for -fsplit-stack.
+ # This should be used in config.host for any host which supports
+ # -fsplit-stack.
+ifeq ($(enable_threads),yes)
+ LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
+endif
--- a/package/gdb/7.11.1/0001-Revert-sim-unify-SIM_CPU-definition.patch
+++ b/package/gdb/7.11.1/0001-Revert-sim-unify-SIM_CPU-definition.patch
@ -1,355 +0,0 @@
-From 77080d5f7fd47dd567f22807d336bc9111f93d7b Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 4 Aug 2016 23:44:24 +0200
-Subject: [PATCH] Revert "sim: unify SIM_CPU definition"
-
-This reverts commit 20bca71d82598a015de0991196e45f0b5f7ead81.
-
-This change causes a redefinition of SIM_CPU on the Blackfin
-architecture, as it is defined in both the common sim/common/sim-base.h
-and the architecture specific sim/bfin/sim-main.h.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
- sim/arm/sim-main.h        | 3 +++
- sim/avr/sim-main.h        | 2 ++
- sim/bfin/sim-main.h       | 2 --
- sim/common/sim-base.h     | 2 --
- sim/cr16/sim-main.h       | 2 ++
- sim/cris/sim-main.h       | 3 +++
- sim/d10v/sim-main.h       | 2 ++
- sim/frv/sim-main.h        | 3 +++
- sim/ft32/sim-main.h       | 2 ++
- sim/h8300/sim-main.h      | 3 +++
- sim/iq2000/sim-main.h     | 3 +++
- sim/lm32/sim-main.h       | 3 +++
- sim/m32r/sim-main.h       | 3 +++
- sim/m68hc11/sim-main.h    | 3 +++
- sim/mcore/sim-main.h      | 2 ++
- sim/microblaze/sim-main.h | 3 +++
- sim/mips/sim-main.h       | 3 +++
- sim/mn10300/sim-main.h    | 2 ++
- sim/moxie/sim-main.h      | 3 +++
- sim/msp430/sim-main.h     | 3 +++
- sim/sh/sim-main.h         | 3 +++
- sim/sh64/sim-main.h       | 3 +++
- sim/v850/sim-main.h       | 3 +++
- 23 files changed, 57 insertions(+), 4 deletions(-)
-
-diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h
-index 3620810..f644122 100644
--- a/sim/arm/sim-main.h
-+++ b/sim/arm/sim-main.h
-@@ -20,6 +20,9 @@
- #define SIM_MAIN_H
- 
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- #include "bfd.h"
- 
-diff --git a/sim/avr/sim-main.h b/sim/avr/sim-main.h
-index 47155e3..cd41045 100644
--- a/sim/avr/sim-main.h
-+++ b/sim/avr/sim-main.h
-@@ -21,6 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
- #include "sim-basics.h"
- 
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- 
- struct _sim_cpu {
-diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h
-index 51fb87e..cf1ed57 100644
--- a/sim/bfin/sim-main.h
-+++ b/sim/bfin/sim-main.h
-@@ -24,8 +24,6 @@
- #include "sim-basics.h"
- #include "sim-signal.h"
- 
-/* TODO: Delete this.  Need to convert bu32/etc... to common sim types
-         and unwind the bfin-sim.h/machs.h include below first though.  */
- typedef struct _sim_cpu SIM_CPU;
- 
- #include "bfin-sim.h"
-diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
-index 350b352..1b849f4 100644
--- a/sim/common/sim-base.h
-+++ b/sim/common/sim-base.h
-@@ -72,8 +72,6 @@ typedef address_word sim_cia;
- #define INVALID_INSTRUCTION_ADDRESS ((address_word)0 - 1)
- #endif
- 
-/* TODO: Probably should just delete SIM_CPU.  */
-typedef struct _sim_cpu SIM_CPU;
- typedef struct _sim_cpu sim_cpu;
- 
- #include "sim-module.h"
-diff --git a/sim/cr16/sim-main.h b/sim/cr16/sim-main.h
-index 208f917..78e3996 100644
--- a/sim/cr16/sim-main.h
-+++ b/sim/cr16/sim-main.h
-@@ -24,6 +24,8 @@
- typedef long int           word;
- typedef unsigned long int  uword;
- 
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- #include "bfd.h"
- 
-diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
-index 8aab970..0ff907f 100644
--- a/sim/cris/sim-main.h
-+++ b/sim/cris/sim-main.h
-@@ -29,6 +29,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-    one of -scache/-pbb.  */
- #define WITH_SCACHE_PBB 1
- 
-+struct _sim_cpu;
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "symcat.h"
- #include "sim-basics.h"
- #include "cgen-types.h"
-diff --git a/sim/d10v/sim-main.h b/sim/d10v/sim-main.h
-index 76f06d8..fd5bd51 100644
--- a/sim/d10v/sim-main.h
-+++ b/sim/d10v/sim-main.h
-@@ -24,6 +24,8 @@
- typedef long int           word;
- typedef unsigned long int  uword;
- 
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- #include "bfd.h"
- 
-diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
-index f95c1cc..701e208 100644
--- a/sim/frv/sim-main.h
-+++ b/sim/frv/sim-main.h
-@@ -19,6 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- 
- /* Main header for the frv.  */
- 
-+struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-+typedef struct _sim_cpu SIM_CPU;
-+
- /* sim-basics.h includes config.h but cgen-types.h must be included before
-    sim-basics.h and cgen-types.h needs config.h.  */
- #include "config.h"
-diff --git a/sim/ft32/sim-main.h b/sim/ft32/sim-main.h
-index a15b247..eef0201 100644
--- a/sim/ft32/sim-main.h
-+++ b/sim/ft32/sim-main.h
-@@ -25,6 +25,8 @@
- #include "sim-base.h"
- #include "bfd.h"
- 
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "ft32-sim.h"
- 
- struct _sim_cpu {
-diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h
-index 6dbc1ac..e95c4d9 100644
--- a/sim/h8300/sim-main.h
-+++ b/sim/h8300/sim-main.h
-@@ -87,6 +87,9 @@ enum h8_typecodes {
- };
- 
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- 
- /* Structure used to describe addressing */
-diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h
-index 829f9bb..a770dc5 100644
--- a/sim/iq2000/sim-main.h
-+++ b/sim/iq2000/sim-main.h
-@@ -4,6 +4,9 @@
- #ifndef SIM_MAIN_H
- #define SIM_MAIN_H
- 
-+struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-+typedef struct _sim_cpu SIM_CPU;
-+
- /* sim-basics.h includes config.h but cgen-types.h must be included before
-    sim-basics.h and cgen-types.h needs config.h.  */
- #include "config.h"
-diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
-index 20e2b71..eeffde3 100644
--- a/sim/lm32/sim-main.h
-+++ b/sim/lm32/sim-main.h
-@@ -25,6 +25,9 @@
- 
- #define WITH_SCACHE_PBB 1
- 
-+struct _sim_cpu;		/* FIXME: should be in sim-basics.h */
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "symcat.h"
- #include "sim-basics.h"
- #include "cgen-types.h"
-diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
-index 5b24ce8..39f7ecc 100644
--- a/sim/m32r/sim-main.h
-+++ b/sim/m32r/sim-main.h
-@@ -8,6 +8,9 @@
-    one of -scache/-pbb.  */
- #define WITH_SCACHE_PBB 1
- 
-+struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "symcat.h"
- #include "sim-basics.h"
- #include "cgen-types.h"
-diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h
-index b940df7..0aa096f 100644
--- a/sim/m68hc11/sim-main.h
-+++ b/sim/m68hc11/sim-main.h
-@@ -21,6 +21,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- #define _SIM_MAIN_H
- 
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-signal.h"
- #include "sim-base.h"
- 
-diff --git a/sim/mcore/sim-main.h b/sim/mcore/sim-main.h
-index fce26e8..fa7ee9f 100644
--- a/sim/mcore/sim-main.h
-+++ b/sim/mcore/sim-main.h
-@@ -24,6 +24,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- typedef long int           word;
- typedef unsigned long int  uword;
- 
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- #include "bfd.h"
- 
-diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h
-index 3a7b088..9e6bf01 100644
--- a/sim/microblaze/sim-main.h
-+++ b/sim/microblaze/sim-main.h
-@@ -20,6 +20,9 @@
- 
- #include "microblaze.h"
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- 
- /* The machine state.
-diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
-index 0ea1234..eedbfc9 100644
--- a/sim/mips/sim-main.h
-+++ b/sim/mips/sim-main.h
-@@ -27,6 +27,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR))
- 
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- #include "bfd.h"
- 
-diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
-index 7171c03..3a917e7 100644
--- a/sim/mn10300/sim-main.h
-+++ b/sim/mn10300/sim-main.h
-@@ -38,6 +38,8 @@
- #include "itable.h"
- #include "idecode.h"
- 
-+typedef struct _sim_cpu SIM_CPU;
-+
- #define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR)  \
- mn10300_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR))
- 
-diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h
-index 7091f21..b6b5ca3 100644
--- a/sim/moxie/sim-main.h
-+++ b/sim/moxie/sim-main.h
-@@ -21,6 +21,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- #define SIM_MAIN_H
- 
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- #include "bfd.h"
- 
-diff --git a/sim/msp430/sim-main.h b/sim/msp430/sim-main.h
-index 4a2ab22..c7cdc5e 100644
--- a/sim/msp430/sim-main.h
-+++ b/sim/msp430/sim-main.h
-@@ -23,6 +23,9 @@
- 
- #include "sim-basics.h"
- #include "sim-signal.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "msp430-sim.h"
- #include "sim-base.h"
- 
-diff --git a/sim/sh/sim-main.h b/sim/sh/sim-main.h
-index 4af7b03..6ab42a6 100644
--- a/sim/sh/sim-main.h
-+++ b/sim/sh/sim-main.h
-@@ -20,6 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
- #define SIM_MAIN_H
- 
- #include "sim-basics.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- 
- typedef struct
-diff --git a/sim/sh64/sim-main.h b/sim/sh64/sim-main.h
-index da8f516..5fd7095 100644
--- a/sim/sh64/sim-main.h
-+++ b/sim/sh64/sim-main.h
-@@ -3,6 +3,9 @@
- #ifndef SIM_MAIN_H
- #define SIM_MAIN_H
- 
-+struct _sim_cpu; /* FIXME: should be in sim-basics.h */
-+typedef struct _sim_cpu SIM_CPU;
-+
- /* sim-basics.h includes config.h but cgen-types.h must be included before
-    sim-basics.h and cgen-types.h needs config.h.  */
- #include "config.h"
-diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h
-index e7276a6..1a45f97 100644
--- a/sim/v850/sim-main.h
-+++ b/sim/v850/sim-main.h
-@@ -9,6 +9,9 @@
- #include "sim-basics.h"
- #include "sim-signal.h"
- #include "sim-fpu.h"
-+
-+typedef struct _sim_cpu SIM_CPU;
-+
- #include "sim-base.h"
- 
- #include "simops.h"
-- 
-2.7.4
-
--- a/package/gdb/7.11.1/0001-sim-bfin-split-out-common-mach-model-defines-into-ar.patch
+++ b/package/gdb/7.11.1/0001-sim-bfin-split-out-common-mach-model-defines-into-ar.patch
@ -0,0 +1,155 @@
+From 7a09ed68e203a813d88fb7fc6eeb1e92209561a5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 8 Aug 2016 13:06:49 +0800
+Subject: [PATCH] sim: bfin: split out common mach/model defines into arch.h
+ [PR sim/20438]
+
+The current machs.h mixes common enums with Blackfin-specific defines.
+This causes us troubles with header inclusion order such that we can't
+drop the old SIM_CPU typedef (which is duplicated in common code).  By
+splitting the two up, we can unwind this dependency chain, and drop the
+old typedef.  It also fixes building with older gcc versions.
+
+[Romain: backport from gdb 7.12]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+
+---
+ sim/bfin/ChangeLog  |  9 +++++++++
+ sim/bfin/arch.h     | 44 ++++++++++++++++++++++++++++++++++++++++++++
+ sim/bfin/machs.h    | 20 --------------------
+ sim/bfin/sim-main.h |  8 ++------
+ 4 files changed, 55 insertions(+), 26 deletions(-)
+ create mode 100644 sim/bfin/arch.h
+
+diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
+index 3dea7c9..a995436 100644
+--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
+@@ -1,3 +1,12 @@
+2016-08-13  Mike Frysinger  <vapier@gentoo.org>
+
+	PR sim/20438
+	* machs.h (MODEL_TYPE, MACH_ATTR, BFIN_INSN_*): Move ...
+	* arch.h: ... to this new header file.
+	* sim-main.h (SIM_CPU): Delete.
+	Include arch.h before sim-base.h, and move sim-base.h before
+	bfin-sim.h.
+
+ 2016-01-10  Mike Frysinger  <vapier@gentoo.org>
+ 
+ 	* config.in, configure: Regenerate.
+diff --git a/sim/bfin/arch.h b/sim/bfin/arch.h
+new file mode 100644
+index 0000000..b86d3e9
+--- /dev/null
+++ b/sim/bfin/arch.h
+@@ -0,0 +1,44 @@
+/* Simulator for Analog Devices Blackfin processors.
+
+   Copyright (C) 2005-2016 Free Software Foundation, Inc.
+   Contributed by Analog Devices, Inc.
+
+   This file is part of simulators.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef BFIN_ARCH_H
+#define BFIN_ARCH_H
+
+typedef enum model_type {
+#define P(n) MODEL_BF##n,
+#include "proc_list.def"
+#undef P
+  MODEL_MAX
+} MODEL_TYPE;
+
+typedef enum mach_attr {
+  MACH_BASE,
+  MACH_BFIN,
+  MACH_MAX
+} MACH_ATTR;
+
+enum {
+#define I(insn) BFIN_INSN_##insn,
+#include "insn_list.def"
+#undef I
+  BFIN_INSN_MAX
+};
+
+#endif
+diff --git a/sim/bfin/machs.h b/sim/bfin/machs.h
+index 0372982..36819ae 100644
+--- a/sim/bfin/machs.h
+++ b/sim/bfin/machs.h
+@@ -21,19 +21,6 @@
+ #ifndef _BFIN_MACHS_H_
+ #define _BFIN_MACHS_H_
+ 
+-typedef enum model_type {
+-#define P(n) MODEL_BF##n,
+-#include "proc_list.def"
+-#undef P
+-  MODEL_MAX
+-} MODEL_TYPE;
+-
+-typedef enum mach_attr {
+-  MACH_BASE,
+-  MACH_BFIN,
+-  MACH_MAX
+-} MACH_ATTR;
+-
+ #define CPU_MODEL_NUM(cpu) MODEL_NUM (CPU_MODEL (cpu))
+ 
+ /* XXX: Some of this probably belongs in CPU_MODEL.  */
+@@ -46,13 +33,6 @@ void bfin_model_cpu_init (SIM_DESC, SIM_CPU *);
+ bu32 bfin_model_get_chipid (SIM_DESC);
+ bu32 bfin_model_get_dspid (SIM_DESC);
+ 
+-enum {
+-#define I(insn) BFIN_INSN_##insn,
+-#include "insn_list.def"
+-#undef I
+-  BFIN_INSN_MAX
+-};
+-
+ #define BFIN_COREMMR_CEC_BASE		0xFFE02100
+ #define BFIN_COREMMR_CEC_SIZE		(4 * 5)
+ #define BFIN_COREMMR_CTIMER_BASE	0xFFE03000
+diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h
+index 51fb87e..34fd153 100644
+--- a/sim/bfin/sim-main.h
+++ b/sim/bfin/sim-main.h
+@@ -23,17 +23,13 @@
+ 
+ #include "sim-basics.h"
+ #include "sim-signal.h"
+-
+-/* TODO: Delete this.  Need to convert bu32/etc... to common sim types
+-         and unwind the bfin-sim.h/machs.h include below first though.  */
+-typedef struct _sim_cpu SIM_CPU;
+#include "arch.h"
+#include "sim-base.h"
+ 
+ #include "bfin-sim.h"
+ 
+ #include "machs.h"
+ 
+-#include "sim-base.h"
+-
+ struct _sim_cpu {
+   /* ... simulator specific members ... */
+   struct bfin_cpu_state state;
+-- 
+2.9.3
+
--- a/package/genimage/Config.in.host
+++ b/package/genimage/Config.in.host
@ -5,7 +5,7 @@ config BR2_PACKAGE_HOST_GENIMAGE
 	  images from a given root filesystem tree. genimage is
 	  intended to be run in a fakeroot environment.

-	  Configuration is done is a config file parsed by
+	  Configuration is done in a config file parsed by
 	  libconfuse. Options like the path to tools can be given in
 	  environment variables, the config file or commandline
 	  switches.
--- a/package/git/git.mk
+++ b/package/git/git.mk
@ -7,7 +7,7 @@
 GIT_VERSION = 2.11.1
 GIT_SOURCE = git-$(GIT_VERSION).tar.xz
 GIT_SITE = https://www.kernel.org/pub/software/scm/git
-GIT_LICENSE = GPLv2 LGPLv2.1+
+GIT_LICENSE = GPLv2, LGPLv2.1+
 GIT_LICENSE_FILES = COPYING LGPL-2.1
 GIT_DEPENDENCIES = zlib host-gettext

--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@ -101,9 +101,9 @@ endef
 #

 GLIBC_LIBS_LIB = \
-	ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.*        \
-	libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.*   \
-	libnss_files.so.* libnss_dns.so.* libmvec.so.*
+	ld*.so.* libanl.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* \
+	libm.so.* libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* \
+	libutil.so.* libnss_files.so.* libnss_dns.so.* libmvec.so.*

 ifeq ($(BR2_PACKAGE_GDB),y)
 GLIBC_LIBS_LIB += libthread_db.so.*
--- a/package/glmark2/Config.in
+++ b/package/glmark2/Config.in
@ -10,11 +10,17 @@ config BR2_PACKAGE_GLMARK2_GL
 	depends on BR2_PACKAGE_HAS_LIBGL
 	depends on BR2_PACKAGE_MESA3D_DRI_DRIVER

+comment "glmark2 needs a toolchain w/ C++, gcc >= 4.9"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+
 comment "glmark2 needs an OpenGL or an openGL ES and EGL backend provided by mesa3d"
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 && BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_PACKAGE_GLMARK2_GL && !BR2_PACKAGE_GLMARK2_EGL_GLES

 config BR2_PACKAGE_GLMARK2
 	bool "glmark2"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14
 	depends on BR2_PACKAGE_GLMARK2_GL || BR2_PACKAGE_GLMARK2_EGL_GLES
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBPNG
--- a/package/glmark2/glmark2.hash
+++ b/package/glmark2/glmark2.hash
@ -1,2 +1,2 @@
 # Locally computed
-sha256 421bdb87ed8c04a25f60816c7754d45e91a45136f5489df59d74001c159882b8 glmark2-fa71af2dfab711fac87b9504b6fc9862f44bf72a.tar.gz
+sha256 ea59bd267a88e2c773423eec43f7cb90b0ca1c369762e836dec575ebdcdcc012 glmark2-7215c0f337dae0b232535549c37fca441747a891.tar.gz
--- a/package/glmark2/glmark2.mk
+++ b/package/glmark2/glmark2.mk
@ -4,9 +4,9 @@
 #
 ################################################################################

-GLMARK2_VERSION = fa71af2dfab711fac87b9504b6fc9862f44bf72a
+GLMARK2_VERSION = 7215c0f337dae0b232535549c37fca441747a891
 GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION))
-GLMARK2_LICENSE = GPLv3+ SGIv1
+GLMARK2_LICENSE = GPLv3+, SGIv1
 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI
 GLMARK2_DEPENDENCIES = host-pkgconf jpeg libpng \
 	$(if $(BR2_PACKAGE_HAS_LIBEGL),libegl) \
--- a/package/gstreamer/gstreamer/gstreamer.mk
+++ b/package/gstreamer/gstreamer/gstreamer.mk
@ -15,7 +15,7 @@ GSTREAMER_LICENSE_FILES = COPYING
 # Checking if unaligned memory access works correctly cannot be done when cross
 # compiling. For the following architectures there is no information available
 # in the configure script.
-ifeq ($(BR2_arc)$(BR2_xtensa)$(BR2_microblaze)$(BR2_nios2),y)
+ifeq ($(BR2_arc)$(BR2_xtensa)$(BR2_microblaze)$(BR2_nios2)$(BR2_or1k),y)
 GSTREAMER_CONF_ENV = as_cv_unaligned_access=no
 endif
 ifeq ($(BR2_aarch64),y)
--- a/package/gstreamer1/gst-omx/gst-omx.hash
+++ b/package/gstreamer1/gst-omx/gst-omx.hash
@ -1,2 +1,2 @@
-# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.10.3.tar.xz.sha256sum
-sha256 dd88451e175df7a6b6f619eff0f43a6078054ec7068787b19faf89af94cdb6e1  gst-omx-1.10.3.tar.xz
+# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.10.4.tar.xz.sha256sum
+sha256 45072925cf262f0fd528fab78f0de52734e46a5a88aa802fae51c67c09c81aa2  gst-omx-1.10.4.tar.xz
--- a/package/gstreamer1/gst-omx/gst-omx.mk
+++ b/package/gstreamer1/gst-omx/gst-omx.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-GST_OMX_VERSION = 1.10.3
+GST_OMX_VERSION = 1.10.4
 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz
 GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx

--- a/package/gstreamer1/gst1-libav/gst1-libav.hash
+++ b/package/gstreamer1/gst1-libav/gst1-libav.hash
@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.3.tar.xz.sha256sum
-sha256 9a6bc165b1862b18b98d9f1755c43806e4839a80f69ec7ea9a2dab61b65752a9  gst-libav-1.10.3.tar.xz
+# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.4.tar.xz.sha256sum
+sha256 6ca0feca75e3d48315e07f20ec37cf6260ed1e9dde58df355febd5016246268b  gst-libav-1.10.4.tar.xz
--- a/package/gstreamer1/gst1-libav/gst1-libav.mk
+++ b/package/gstreamer1/gst1-libav/gst1-libav.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-GST1_LIBAV_VERSION = 1.10.3
+GST1_LIBAV_VERSION = 1.10.4
 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz
 GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav
 GST1_LIBAV_CONF_OPTS = --with-system-libav
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash
@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.3.tar.xz.sha256sum
-sha256 24099351fb6984c9e7560de06e072ff2e33d0b2db38b8fcc7afefb536e5094e7  gst-plugins-bad-1.10.3.tar.xz
+# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.4.tar.xz.sha256sum
+sha256 23ddae506b3a223b94869a0d3eea3e9a12e847f94d2d0e0b97102ce13ecd6966  gst-plugins-bad-1.10.4.tar.xz
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@ -4,14 +4,14 @@
 #
 ################################################################################

-GST1_PLUGINS_BAD_VERSION = 1.10.3
+GST1_PLUGINS_BAD_VERSION = 1.10.4
 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
 GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad
 GST1_PLUGINS_BAD_INSTALL_STAGING = YES
 GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB
 # Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE if
 # enabled.
-GST1_PLUGINS_BAD_LICENSE = LGPLv2+ LGPLv2.1+
+GST1_PLUGINS_BAD_LICENSE = LGPLv2+, LGPLv2.1+

 GST1_PLUGINS_BAD_CONF_OPTS = \
 	--disable-examples \
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash
@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.3.tar.xz.sha256sum
-sha256 e6299617d705a0cbfb535107c1d3a8fc0f0967f14193a8c5c7583f46a88b1710  gst-plugins-base-1.10.3.tar.xz
+# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.4.tar.xz.sha256sum
+sha256 f6d245b6b3d4cb733f81ebb021074c525ece83db0c10e932794b339b8d935eb7  gst-plugins-base-1.10.4.tar.xz
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-GST1_PLUGINS_BASE_VERSION = 1.10.3
+GST1_PLUGINS_BASE_VERSION = 1.10.4
 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
 GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base
 GST1_PLUGINS_BASE_INSTALL_STAGING = YES
--- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash
+++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash
@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.3.tar.xz.sha256sum
-sha256 4e07e93e34d4b93208f1579c21e7d91a236577b36f128a5332ffee85b4465955  gst-plugins-good-1.10.3.tar.xz
+# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.4.tar.xz.sha256sum
+sha256 8a86c61434a8c44665365bd0b3557a040937d1f44bf69caee4e9ea816ce74d7e  gst-plugins-good-1.10.4.tar.xz
--- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-GST1_PLUGINS_GOOD_VERSION = 1.10.3
+GST1_PLUGINS_GOOD_VERSION = 1.10.4
 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
 GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good
 GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING
--- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash
+++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash
@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.3.tar.xz.sha256sum
-sha256 c91597d03abff9df435ad4892eae44df1ee14159c7cc7317ac9d2766ff446bd2  gst-plugins-ugly-1.10.3.tar.xz
+# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.4.tar.xz.sha256sum
+sha256 6386c77ca8459cba431ed0b63da780c7062c7cc48055d222024d8eaf198ffa59  gst-plugins-ugly-1.10.4.tar.xz
--- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-GST1_PLUGINS_UGLY_VERSION = 1.10.3
+GST1_PLUGINS_UGLY_VERSION = 1.10.4
 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
 GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly
 GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING
--- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash
+++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash
@ -1,2 +1,2 @@
-# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.10.3.tar.xz.sha256sum
-sha256 baf9f7d229711cb3d823a447a930132f809b3321eab3535491bb01c8a21566fe  gst-rtsp-server-1.10.3.tar.xz
+# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.10.4.tar.xz.sha256sum
+sha256 2f6e12fd4e3568ee190dc24e57e4c3a878971c3a3fb6904a9674404fac256de6  gst-rtsp-server-1.10.4.tar.xz
--- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk
+++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-GST1_RTSP_SERVER_VERSION = 1.10.3
+GST1_RTSP_SERVER_VERSION = 1.10.4
 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz
 GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server
 GST1_RTSP_SERVER_LICENSE = LGPLv2+
--- a/package/gstreamer1/gst1-validate/gst1-validate.hash
+++ b/package/gstreamer1/gst1-validate/gst1-validate.hash
@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.10.3.tar.xz.sha256sum
-sha256 be6b48569324c541266310e7e6d1098b1a2ec7cd06b9e95b6701c96bc4562c02  gst-validate-1.10.3.tar.xz
+# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.10.4.tar.xz.sha256sum
+sha256 e59c00bf64cca9c477cdb44eb8dd0b3aac5499b17d77bf28ee054fd211e8d73c  gst-validate-1.10.4.tar.xz
--- a/package/gstreamer1/gst1-validate/gst1-validate.mk
+++ b/package/gstreamer1/gst1-validate/gst1-validate.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-GST1_VALIDATE_VERSION = 1.10.3
+GST1_VALIDATE_VERSION = 1.10.4
 GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz
 GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate
 GST1_VALIDATE_LICENSE = LGPLv2.1+
--- a/package/gstreamer1/gstreamer1/0001-gstconfig.h.in-Fix-unaligned-access-support-for-the-.patch
+++ b/package/gstreamer1/gstreamer1/0001-gstconfig.h.in-Fix-unaligned-access-support-for-the-.patch
@ -0,0 +1,33 @@
+From 437b3e38d9127ae021ca8510709c2e6be3e6b819 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <peter@korsgaard.com>
+Date: Sat, 18 Feb 2017 10:03:24 +0100
+Subject: [PATCH] gstconfig.h.in: Fix unaligned access support for the openrisc
+ architecture
+
+Teach gstconfig.h.in about the openrisc (or1k) architecture.  Fixes
+buildroot autobuild failure:
+
+http://autobuild.buildroot.net/results/717/717d78ce0935749f477bdf3133b6f20057a28c01/build-end.log
+
+Submitted-upstream: https://bugzilla.gnome.org/show_bug.cgi?id=778866
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ gst/gstconfig.h.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
+index cf95f61ab..1b2ca64ac 100644
+--- a/gst/gstconfig.h.in
+++ b/gst/gstconfig.h.in
+@@ -104,7 +104,7 @@
+  * http://docs.oracle.com/cd/E19205-01/820-4155/c++_faq.html#Vers6
+  * https://software.intel.com/en-us/node/583402
+  */
+-#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_IA64) || defined(__xtensa__)
+#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__or1k__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_IA64) || defined(__xtensa__)
+ #  define GST_HAVE_UNALIGNED_ACCESS 0
+ #elif defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(__m68k__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || defined(__s390__) || defined(__s390x__) || defined(__zarch__)
+ #  define GST_HAVE_UNALIGNED_ACCESS 1
+-- 
+2.11.0
+
--- a/package/gstreamer1/gstreamer1/gstreamer1.hash
+++ b/package/gstreamer1/gstreamer1/gstreamer1.hash
@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.3.tar.xz.sha256sum
-sha256 85b9dc1b2991f224fa90d534ec57014896c479e061dc9fa1bc16ae17cbebb63d  gstreamer-1.10.3.tar.xz
+# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.4.tar.xz.sha256sum
+sha256 50c2f5af50a6cc6c0a3f3ed43bdd8b5e2bff00bacfb766d4be139ec06d8b5218  gstreamer-1.10.4.tar.xz
--- a/package/gstreamer1/gstreamer1/gstreamer1.mk
+++ b/package/gstreamer1/gstreamer1/gstreamer1.mk
@ -4,23 +4,13 @@
 #
 ################################################################################

-GSTREAMER1_VERSION = 1.10.3
+GSTREAMER1_VERSION = 1.10.4
 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
 GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer
 GSTREAMER1_INSTALL_STAGING = YES
 GSTREAMER1_LICENSE_FILES = COPYING
 GSTREAMER1_LICENSE = LGPLv2+, LGPLv2.1+

-# Checking if unaligned memory access works correctly cannot be done when cross
-# compiling. For the following architectures there is no information available
-# in the configure script.
-ifeq ($(BR2_arc)$(BR2_xtensa)$(BR2_microblaze)$(BR2_nios2),y)
-GSTREAMER1_CONF_ENV = as_cv_unaligned_access=no
-endif
-ifeq ($(BR2_aarch64),y)
-GSTREAMER1_CONF_ENV = as_cv_unaligned_access=yes
-endif
-
 GSTREAMER1_CONF_OPTS = \
 	--disable-examples \
 	--disable-tests \
--- a/package/heimdal/heimdal.mk
+++ b/package/heimdal/heimdal.mk
@ -24,7 +24,7 @@ HOST_HEIMDAL_CONF_OPTS = \
 	--without-hesiod \
 	--without-x \
 	--disable-heimdal-documentation
-HOST_HEIMDAL_CONF_ENV = MAKEINFO=true LIBS="-lpthread"
+HOST_HEIMDAL_CONF_ENV = MAKEINFO=true
 HEIMDAL_LICENSE = BSD-3c
 HEIMDAL_LICENSE_FILES = LICENSE

--- a/package/hiredis/hiredis.mk
+++ b/package/hiredis/hiredis.mk
@ -19,7 +19,7 @@ ifeq ($(BR2_STATIC_LIBS),y)
 HIREDIS_TARGETS += static
 else ifeq ($(BR2_SHARED_LIBS),y)
 HIREDIS_TARGETS += dynamic
-else ifeq $(BR2_SHARED_STATIC_LIBS),y)
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
 HIREDIS_TARGETS += dynamic static
 endif

--- a/package/hplip/hplip.mk
+++ b/package/hplip/hplip.mk
@ -8,7 +8,7 @@ HPLIP_VERSION = 3.16.11
 HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip
 HPLIP_AUTORECONF = YES
 HPLIP_DEPENDENCIES = cups libusb jpeg host-pkgconf
-HPLIP_LICENSE = GPLv2 BSD-3c MIT
+HPLIP_LICENSE = GPLv2, BSD-3c, MIT
 HPLIP_LICENSE_FILES = COPYING

 HPLIP_CONF_OPTS = \
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@ -18,4 +18,11 @@ else
 HTOP_CONF_OPTS += --disable-unicode
 endif

+# ARC uses an old uClibc that needs dladdr() for backtrace support,
+# which doesn't work for static only scenario, so as a workaround, we
+# pretend that execinfo.h is not available.
+ifeq ($(BR2_arc)$(BR2_STATIC_LIBS),yy)
+HTOP_CONF_ENV += ac_cv_header_execinfo_h=no
+endif
+
 $(eval $(autotools-package))
--- a/package/iprutils/Config.in
+++ b/package/iprutils/Config.in
@ -1,9 +1,6 @@
 config BR2_PACKAGE_IPRUTILS
 	bool "iprutils"
 	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_NCURSES_TARGET_PANEL
-	select BR2_PACKAGE_NCURSES_TARGET_FORM
-	select BR2_PACKAGE_NCURSES_TARGET_MENU
 	select BR2_PACKAGE_LIBSYSFS
 	select BR2_PACKAGE_PCIUTILS
 	depends on BR2_USE_MMU # fork()
--- a/package/iptraf-ng/Config.in
+++ b/package/iptraf-ng/Config.in
@ -2,7 +2,6 @@ config BR2_PACKAGE_IPTRAF_NG
 	bool "iptraf-ng"
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_NCURSES_TARGET_PANEL
 	help
 	  IPTraf-ng is a ncurses-based network monitoring utility. It gathers
 	  data like TCP connection packet and byte counts, interface statistics
--- a/package/jamvm/Config.in
+++ b/package/jamvm/Config.in
@ -4,6 +4,7 @@ config BR2_PACKAGE_JAMVM
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
 		|| BR2_mips || BR2_mipsel || BR2_powerpc
+	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_CLASSPATH
 	help
@ -15,4 +16,5 @@ config BR2_PACKAGE_JAMVM
 comment "jamvm needs a toolchain w/ threads, dynamic library"
 	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
 		|| BR2_mips || BR2_mipsel || BR2_powerpc
+	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
--- a/package/kismet/Config.in
+++ b/package/kismet/Config.in
@ -10,7 +10,6 @@ config BR2_PACKAGE_KISMET
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS # dlfcn.h
 	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_NCURSES_TARGET_PANEL
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBNL
 	help
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@ -15,6 +15,12 @@ HOST_KMOD_DEPENDENCIES = host-pkgconf
 KMOD_LICENSE = LGPLv2.1+ (library)
 KMOD_LICENSE_FILES = libkmod/COPYING

+# --gc-sections triggers binutils ld segfault
+# https://sourceware.org/bugzilla/show_bug.cgi?id=21180
+ifeq ($(BR2_microblaze),y)
+KMOD_CONF_ENV += cc_cv_LDFLAGS__Wl___gc_sections=false
+endif
+
 # static linking not supported, see
 # https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=b7016153ec8
 KMOD_CONF_OPTS = --disable-static --enable-shared
--- a/package/kmsxx/kmsxx.mk
+++ b/package/kmsxx/kmsxx.mk
@ -12,6 +12,12 @@ KMSXX_INSTALL_STAGING = YES
 KMSXX_DEPENDENCIES = libdrm host-pkgconf
 KMSXX_CONF_OPTS = -DKMSXX_ENABLE_PYTHON=OFF

+# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
+ifeq ($(BR2_m68k_cf),y)
+KMSXX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm"
+endif
+
 ifeq ($(BR2_PACKAGE_KMSXX_INSTALL_TESTS),y)
 KMSXX_TESTS = \
 	fbtestpat kmsblank kmscapture \
--- a/package/lcdapi/lcdapi.mk
+++ b/package/lcdapi/lcdapi.mk
@ -11,6 +11,12 @@ LCDAPI_LICENSE_FILES = COPYING
 LCDAPI_AUTORECONF = YES
 LCDAPI_INSTALL_STAGING = YES

+# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
+ifeq ($(BR2_m68k_cf),y)
+LCDAPI_CONF_OPTS += CXXFLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm"
+endif
+
 define LCDAPI_CREATE_M4_DIR
 	mkdir -p $(@D)/m4
 endef
--- a/package/libasplib/libasplib.mk
+++ b/package/libasplib/libasplib.mk
@ -19,6 +19,7 @@ LIBASPLIB_CONF_OPTS = \
 	-DBUILD_TIMER=ON

 # Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
 ifeq ($(BR2_m68k_cf),y)
 LIBASPLIB_CXXFLAGS += -fno-dwarf2-cfi-asm
 endif
--- a/package/libcurl/libcurl.hash
+++ b/package/libcurl/libcurl.hash
@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256 d16185a767cb2c1ba3d5b9096ec54e5ec198b213f45864a38b3bda4bbf87389b  curl-7.52.1.tar.bz2
+sha256 b2345a8bef87b4c229dedf637cb203b5e21db05e20277c8e1094f0d4da180801  curl-7.53.0.tar.bz2
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-LIBCURL_VERSION = 7.52.1
+LIBCURL_VERSION = 7.53.0
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = https://curl.haxx.se/download
 LIBCURL_DEPENDENCIES = host-pkgconf \
--- a/package/libepoxy/libepoxy.mk
+++ b/package/libepoxy/libepoxy.mk
@ -9,7 +9,7 @@ LIBEPOXY_SITE = $(call github,anholt,libepoxy,$(LIBEPOXY_VERSION))
 LIBEPOXY_INSTALL_STAGING = YES
 # For patches 0001-0006:
 LIBEPOXY_AUTORECONF = YES
-LIBEPOXY_DEPENDENCIES = xutil_util-macros
+LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros
 LIBEPOXY_LICENSE = MIT
 LIBEPOXY_LICENSE_FILES = COPYING

--- a/package/libgpiod/libgpiod.hash
+++ b/package/libgpiod/libgpiod.hash
@ -1,2 +1,2 @@
 # Locally computed
-sha256 c9a60e1073aacb25b4ad06d513f31416335b5a710f869cb7e838d2abb62e1e00 libgpiod-v0.1.2.tar.gz
+sha256 670a13518fabf2a99f9e349c33d5421c2146eec15b73c5edef3f1981a7adaeda libgpiod-v0.1.3.tar.gz
--- a/package/libgpiod/libgpiod.mk
+++ b/package/libgpiod/libgpiod.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-LIBGPIOD_VERSION = v0.1.2
+LIBGPIOD_VERSION = v0.1.3
 LIBGPIOD_SITE = $(call github,brgl,libgpiod,$(LIBGPIOD_VERSION))
 LIBGPIOD_LICENSE = GPLv3+
 LIBGPIOD_LICENSE_FILES = COPYING
--- a/package/libimxvpuapi/libimxvpuapi.hash
+++ b/package/libimxvpuapi/libimxvpuapi.hash
@ -1,2 +1,2 @@
 # locally computed hash
-sha256 8e6dc4105db6164c0de72fd60eb73f4ba1632f7ba5052b1abc834b462b566da2  libimxvpuapi-0.10.2.tar.gz
+sha256 7151e10a24929935bada1d3d87626f17e411575b3a4ac0d86440999ad0100a55  libimxvpuapi-0.10.3.tar.gz
--- a/package/libimxvpuapi/libimxvpuapi.mk
+++ b/package/libimxvpuapi/libimxvpuapi.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-LIBIMXVPUAPI_VERSION = 0.10.2
+LIBIMXVPUAPI_VERSION = 0.10.3
 LIBIMXVPUAPI_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI_VERSION))
 LIBIMXVPUAPI_LICENSE = LGPLv2.1+
 LIBIMXVPUAPI_LICENSE_FILES = LICENSE
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@ -9,7 +9,7 @@ LIBLOCKFILE_SOURCE = liblockfile_$(LIBLOCKFILE_VERSION).orig.tar.gz
 LIBLOCKFILE_SITE = http://snapshot.debian.org/archive/debian/20151026T153523Z/pool/main/libl/liblockfile
 LIBLOCKFILE_PATCH = liblockfile_$(LIBLOCKFILE_VERSION)-6.debian.tar.bz2

-LIBLOCKFILE_LICENSE = LGPLv2+, dotlockfile GPLv2+
+LIBLOCKFILE_LICENSE = LGPLv2+, GPLv2+ (dotlockfile)
 LIBLOCKFILE_LICENSE_FILES = COPYRIGHT

 LIBLOCKFILE_INSTALL_STAGING = YES
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@ -13,6 +13,16 @@ LIBNSS_DEPENDENCIES = libnspr sqlite zlib
 LIBNSS_LICENSE = MPLv2.0
 LIBNSS_LICENSE_FILES = nss/COPYING

+# --gc-sections triggers binutils ld segfault
+# https://sourceware.org/bugzilla/show_bug.cgi?id=21180
+ifeq ($(BR2_microblaze),y)
+define LIBNSS_DROP_GC_SECTIONS
+	sed -i 's:-Wl,--gc-sections::g' $(@D)/nss/coreconf/Linux.mk
+endef
+
+LIBNSS_PRE_CONFIGURE_HOOKS += LIBNSS_DROP_GC_SECTIONS
+endif
+
 LIBNSS_BUILD_VARS = \
 	MOZILLA_CLIENT=1 \
 	NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@ -53,8 +53,8 @@ else
 LIBPCAP_CONF_OPTS += --without-libnl
 endif

-# microblaze/sparc64 need -fPIC instead of -fpic
-ifeq ($(BR2_microblaze)$(BR2_sparc64),y)
+# microblaze/sparc/sparc64 need -fPIC instead of -fpic
+ifeq ($(BR2_microblaze)$(BR2_sparc)$(BR2_sparc64),y)
 LIBPCAP_CFLAGS += -fPIC
 endif

--- a/package/libraw/libraw.mk
+++ b/package/libraw/libraw.mk
@ -21,10 +21,15 @@ LIBRAW_CONF_OPTS += \
 LIBRAW_LICENSE = LGPLv2.1 or CDDL 1.0 or LibRaw Software License 27032010
 LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL LICENSE.LibRaw.pdf README
 LIBRAW_DEPENDENCIES = host-pkgconf
+LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS)
+LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)"

 ifeq ($(BR2_PACKAGE_JASPER),y)
 LIBRAW_CONF_OPTS += --enable-jasper
 LIBRAW_DEPENDENCIES += jasper
+# glibc prior to 2.18 only defines constants such as SIZE_MAX or
+# INT_FAST32_MAX for C++ code if __STDC_LIMIT_MACROS is defined
+LIBRAW_CXXFLAGS += -D__STDC_LIMIT_MACROS
 else
 LIBRAW_CONF_OPTS += --disable-jasper
 endif
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@ -7,7 +7,7 @@
 LIBURCU_VERSION = 0.9.2
 LIBURCU_SITE = http://lttng.org/files/urcu
 LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
-LIBURCU_LICENSE = LGPLv2.1+ for the library; MIT-like license for few source files listed in LICENSE; GPLv2+ for test; GPLv3 for few *.m4 files
+LIBURCU_LICENSE = LGPLv2.1+ (library), MIT-like (few source files listed in LICENSE), GPLv2+ (test), GPLv3 (few *.m4 files)
 LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE

 LIBURCU_INSTALL_STAGING = YES
--- a/package/libuv/Config.in
+++ b/package/libuv/Config.in
@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBUV
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_barrier_*
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	help
 	  libuv is a multi-platform support library with a focus
 	  on asynchronous I/O.
@ -12,3 +13,4 @@ config BR2_PACKAGE_LIBUV
 comment "libuv needs a toolchain w/ NPTL, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
 	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
--- a/package/libv4l/0002-ir-ctl-fixes-for-musl-compile.patch
+++ b/package/libv4l/0002-ir-ctl-fixes-for-musl-compile.patch
@ -0,0 +1,59 @@
+From 9908872aaa614a6c4bba80d7a5f1adea7ca7117e Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Tue, 14 Feb 2017 21:27:59 +0100
+Subject: [PATCH] ir-ctl: fixes for musl compile
+
+- add copy of TEMP_FAILURE_RETRY macro
+- use strdup instead of strdupa
+
+Fixes [1]:
+
+  ir-ctl.c:(.text+0xb06): undefined reference to `strndupa'
+  ir-ctl.c:(.text+0xe01): undefined reference to `TEMP_FAILURE_RETRY'
+
+[1] http://autobuild.buildroot.net/results/b8b96c7bbf2147dacac62485cbfdbcfd758271a5
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ utils/ir-ctl/ir-ctl.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/utils/ir-ctl/ir-ctl.c b/utils/ir-ctl/ir-ctl.c
+index bc58cee..e9da777 100644
+--- a/utils/ir-ctl/ir-ctl.c
+++ b/utils/ir-ctl/ir-ctl.c
+@@ -44,6 +44,15 @@
+ 
+ # define N_(string) string
+ 
+/* taken from glibc unistd.h */
+#ifndef TEMP_FAILURE_RETRY
+#define TEMP_FAILURE_RETRY(expression) \
+  (__extension__                                                              \
+    ({ long int __result;                                                     \
+       do __result = (long int) (expression);                                 \
+       while (__result == -1L && errno == EINTR);                             \
+       __result; }))
+#endif
+ 
+ /* See drivers/media/rc/ir-lirc-codec.c line 23 */
+ #define LIRCBUF_SIZE	512
+@@ -344,12 +353,14 @@ static struct file *read_scancode(const char *name)
+ 		return NULL;
+ 	}
+ 
+-	pstr = strndupa(name, p - name);
+	pstr = strndup(name, p - name);
+ 
+ 	if (!protocol_match(pstr, &proto)) {
+ 		fprintf(stderr, _("error: protocol '%s' not found\n"), pstr);
+		free(pstr);
+ 		return NULL;
+ 	}
+	free(pstr);
+ 
+ 	if (!strtoscancode(p + 1, &scancode)) {
+ 		fprintf(stderr, _("error: invalid scancode '%s'\n"), p + 1);
+-- 
+2.11.0
+
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@ -214,15 +214,15 @@ endchoice

 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.2.84"	if BR2_KERNEL_HEADERS_3_2
+	default "3.2.85"	if BR2_KERNEL_HEADERS_3_2
 	default "3.4.113"	if BR2_KERNEL_HEADERS_3_4
-	default "3.10.104"	if BR2_KERNEL_HEADERS_3_10
+	default "3.10.105"	if BR2_KERNEL_HEADERS_3_10
 	default "3.12.70"	if BR2_KERNEL_HEADERS_3_12
 	default "3.18.48"	if BR2_KERNEL_HEADERS_3_18
 	default "3.19.8"	if BR2_KERNEL_HEADERS_3_19
 	default "4.0.9"		if BR2_KERNEL_HEADERS_4_0
 	default "4.1.38"	if BR2_KERNEL_HEADERS_4_1
-	default "4.4.48"	if BR2_KERNEL_HEADERS_4_4
+	default "4.4.52"	if BR2_KERNEL_HEADERS_4_4
 	default "4.8.17"	if BR2_KERNEL_HEADERS_4_8
-	default "4.9.9"		if BR2_KERNEL_HEADERS_4_9
+	default "4.9.13"	if BR2_KERNEL_HEADERS_4_9
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@ -9,7 +9,7 @@ LM_SENSORS_SOURCE = lm-sensors_$(LM_SENSORS_VERSION).orig.tar.bz2
 LM_SENSORS_SITE = http://snapshot.debian.org/archive/debian/20170208T211941Z/pool/main/l/lm-sensors
 LM_SENSORS_INSTALL_STAGING = YES
 LM_SENSORS_DEPENDENCIES = host-bison host-flex
-LM_SENSORS_LICENSE = libsensors LGPLv2.1+, programs GPLv2+
+LM_SENSORS_LICENSE = LGPLv2.1+ (libsensors), GPLv2+ (programs)
 LM_SENSORS_LICENSE_FILES = COPYING.LGPL COPYING

 LM_SENSORS_BINS_ = bin/sensors-conf-convert
--- a/package/luv/Config.in
+++ b/package/luv/Config.in
@ -4,6 +4,7 @@ config BR2_PACKAGE_LUV
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
 	depends on BR2_USE_MMU # libuv
 	depends on !BR2_STATIC_LIBS # libuv
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
 	help
 	  libuv bindings for LuaJIT and Lua.

@ -12,3 +13,4 @@ config BR2_PACKAGE_LUV
 comment "luv needs a toolchain w/ NPTL, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
 	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
--- a/package/luvi/Config.in
+++ b/package/luvi/Config.in
@ -4,6 +4,7 @@ config BR2_PACKAGE_LUVI
 	depends on BR2_USE_MMU # libuv
 	depends on !BR2_STATIC_LIBS # libuv
 	depends on BR2_PACKAGE_LUAJIT
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
 	select BR2_PACKAGE_LIBUV
 	select BR2_PACKAGE_LUV
 	help
@ -25,6 +26,7 @@ config BR2_PACKAGE_LUVI
 comment "luvi needs a toolchain w/ NPTL, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
 	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4

 comment "luvi needs LuaJIT"
 	depends on !BR2_PACKAGE_LUAJIT
--- a/Show More
+++ b/Show More