Update for 2015.08

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
CHANGES: Update with recent changes
2015-08-31 23:06:58 +02:00 · 2015-08-31 22:37:37 +02:00 · 2015-08-31 22:25:07 +02:00 · 2015-08-31 22:17:16 +02:00 · 2015-08-31 10:13:35 +02:00 · 2015-08-31 09:04:09 +02:00
194 changed files with 3998 additions and 798 deletions
@@ -1,3 +1,50 @@
+2015.08, Released August 31st, 2015
+
+	Minor fixes.
+
+	OpenCV 3.x package renamed to opencv3. OpenCV 2.4.x
+	reintroduced as opencv.
+
+	Updated/fixed packages: bootutils, canfestival, cppcms,
+	curlftpfs, dhcpdump, dropbear, erlang-p1-tls, exfat, gnuradio,
+	ipkg, libgudev, libmbim, libwebsock, linux-pam, lm-sensors,
+	ltrace, midori, network-manager, openssh, perl-file-listing,
+	perl-http-cookies, perl-http-daemon, perl-http-negotiate,
+	perl-www-robotrules, python-can, qt5base, qt5multimedia,
+	setools, sysvinit, tinyalsa, tn5250, tvheadend, uboot, vlc,
+	x264, xserver_xorg-server, zyre
+
+2015.08-rc2, Released August, 24th 2015
+
+	Fixes all over the tree.
+
+	Toolchain: fix gcc build on NIOS-II.
+
+	Infrastructure: add <fs>_POST_GEN_HOOKS mechanism to fix
+	hybrid ISO image generation.
+
+	Architectures: add arm1136j-s variant.
+
+	Updated/fixed packages: apitrace, audit, bcusdk, bdwgc,
+	beecrypt, boost, bwm-ng, cdrkit, c-icap, cifs-utils, clapack,
+	c-periphery, cpio, cramfs, czmq, dawgdic, dnsmasq, dosfstools,
+	dropbear, elfutils, empty, eudev, fan-ctrl, filemq, gnutls,
+	guile, haveged, imlib2, libcec, libepoxy, libev, libgpgme,
+	libiio, libnetfilter_queue, libnfnetlink, libpfm4, libpthsem,
+	librtas, libselinux, libsigsegv, libsodium, libv4l, lightning,
+	linux, lirc-tools, lrzsz, mono, mosh, mpd, msmtp, nbd,
+	netatalk, nodejs, ola, opencv, oprofile, php, poco,
+	postgresql, powertop, protobuf, protobuf-c, qt5base,
+	qt5quickcontrols, rapidjson, rng-tools, squid, sysdig,
+	sysstat, tftpd, tinc, tz, util-linux, webkitgtk24, weston,
+	wireshark, wvstreams, xdriver_xf86-input-synaptics, zyre.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#8276: package/dropbear: symlink resolution incorrect
+	#8286: Error with buildroot
+	#8301: ldconfig parameter in Makefile
+
 2015.08-rc1, Released August, 5th 2015

 	Fixes all over the tree and new features.
@@ -194,38 +194,6 @@ config BR2_TARGET_UBOOT_NETWORK
 	help
 	  U-Boot's custom network settings options have been removed.

-config BR2_PACKAGE_OPENCV_LIB_CONTRIB
-	bool "opencv contrib module no longer exists"
-	select BR2_LEGACY
-	help
-	  OpenCV >=3.0 does not come with in-tree contrib modules.
-
-	  They have been moved out of the OpenCV base tree, into the opencv_contrib
-	  repository:
-	    https://github.com/Itseez/opencv_contrib
-
-config BR2_PACKAGE_OPENCV_LIB_GPU
-	bool "opencv gpu module no longer exists"
-	select BR2_LEGACY
-	help
-	  opencv_gpu module no longer exists as is in OpenCV >=3.0.
-
-	  It has been split into several modules prefixed with "cuda" that require
-	  Cuda programming toolkit, which is not available in Buildroot. So cuda
-	  modules are forcibly disabled in Buildroot.
-
-config BR2_PACKAGE_OPENCV_LIB_LEGACY
-	bool "opencv legacy module no longer exists"
-	select BR2_LEGACY
-	help
-	  opencv_legacy module no longer exists in OpenCV >=3.0.
-
-config BR2_PACKAGE_OPENCV_LIB_NONFREE
-	bool "opencv nonfree module no longer exists"
-	select BR2_LEGACY
-	help
-	  opencv_nonfree module no longer exists in OpenCV >=3.0.
-
 ###############################################################################
 comment "Legacy options removed in 2015.05"

@@ -41,7 +41,7 @@ else # umask
 all:

 # Set and export the version string
-export BR2_VERSION := 2015.08-rc1
+export BR2_VERSION := 2015.08

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -78,6 +78,12 @@ config BR2_arm926t
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV5
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+config BR2_arm1136j_s
+	bool "arm1136j-s"
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_HAS_THUMB
+	select BR2_ARM_CPU_ARMV6
+	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_arm1136jf_s
 	bool "arm1136jf-s"
 	select BR2_ARM_CPU_HAS_ARM
@@ -0,0 +1,742 @@
+From ee11fed43e2bd029f71af1e72ab9bb5652f5fc54 Mon Sep 17 00:00:00 2001
+From: Alexey Brodkin <abrodkin@synopsys.com>
+Date: Wed, 29 Jul 2015 20:32:59 +0300
+Subject: [PATCH] Revert "arch: Make board selection choices optional"
+
+This reverts commit a26cd04920dc069fd6e91abb785426cf6c29f45f.
+
+Reverted commit caused an issue with "make oldconfig" - default prompt
+for target selection was set as No that lead to missing platform
+selection by automated scripts like that:
+------------------>8------------------
+"yes "" | make oldconfig" on defconfig
+------------------>8------------------
+
+And that lead to build failure:
+------------------>8------------------
+$ make
+scripts/kconfig/conf --silentoldconfig Kconfig
+  CHK     include/config.h
+  UPD     include/config.h
+  GEN     include/autoconf.mk
+In file included from ./include/common.h:18:0:
+include/config.h:5:22: fatal error: configs/.h: No such file or directory
+ #include <configs/.h>
+                      ^
+compilation terminated.
+scripts/Makefile.autoconf:72: recipe for target 'include/autoconf.mk' failed
+make[1]: *** [include/autoconf.mk] Error 1
+------------------>8------------------
+
+Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
+---
+ arch/arc/Kconfig                     | 1 -
+ arch/arm/Kconfig                     | 1 -
+ arch/arm/cpu/armv7/exynos/Kconfig    | 1 -
+ arch/arm/cpu/armv7/mx5/Kconfig       | 1 -
+ arch/arm/cpu/armv7/mx6/Kconfig       | 1 -
+ arch/arm/cpu/armv7/omap3/Kconfig     | 1 -
+ arch/arm/cpu/armv7/omap4/Kconfig     | 1 -
+ arch/arm/cpu/armv7/omap5/Kconfig     | 1 -
+ arch/arm/cpu/armv7/rmobile/Kconfig   | 1 -
+ arch/arm/cpu/armv7/s5pc1xx/Kconfig   | 1 -
+ arch/arm/mach-at91/Kconfig           | 1 -
+ arch/arm/mach-bcm283x/Kconfig        | 1 -
+ arch/arm/mach-davinci/Kconfig        | 1 -
+ arch/arm/mach-integrator/Kconfig     | 2 --
+ arch/arm/mach-keystone/Kconfig       | 1 -
+ arch/arm/mach-kirkwood/Kconfig       | 1 -
+ arch/arm/mach-nomadik/Kconfig        | 1 -
+ arch/arm/mach-orion5x/Kconfig        | 1 -
+ arch/arm/mach-socfpga/Kconfig        | 1 -
+ arch/arm/mach-tegra/Kconfig          | 1 -
+ arch/arm/mach-tegra/tegra114/Kconfig | 1 -
+ arch/arm/mach-tegra/tegra124/Kconfig | 1 -
+ arch/arm/mach-tegra/tegra20/Kconfig  | 1 -
+ arch/arm/mach-tegra/tegra30/Kconfig  | 1 -
+ arch/arm/mach-zynq/Kconfig           | 1 -
+ arch/avr32/Kconfig                   | 1 -
+ arch/blackfin/Kconfig                | 1 -
+ arch/m68k/Kconfig                    | 1 -
+ arch/microblaze/Kconfig              | 1 -
+ arch/mips/Kconfig                    | 1 -
+ arch/nds32/Kconfig                   | 1 -
+ arch/nios2/Kconfig                   | 1 -
+ arch/openrisc/Kconfig                | 1 -
+ arch/powerpc/Kconfig                 | 1 -
+ arch/powerpc/cpu/mpc512x/Kconfig     | 1 -
+ arch/powerpc/cpu/mpc5xx/Kconfig      | 1 -
+ arch/powerpc/cpu/mpc5xxx/Kconfig     | 1 -
+ arch/powerpc/cpu/mpc8260/Kconfig     | 1 -
+ arch/powerpc/cpu/mpc83xx/Kconfig     | 1 -
+ arch/powerpc/cpu/mpc85xx/Kconfig     | 1 -
+ arch/powerpc/cpu/mpc86xx/Kconfig     | 1 -
+ arch/powerpc/cpu/mpc8xx/Kconfig      | 1 -
+ arch/powerpc/cpu/ppc4xx/Kconfig      | 1 -
+ arch/sh/Kconfig                      | 1 -
+ arch/sparc/Kconfig                   | 1 -
+ board/amcc/canyonlands/Kconfig       | 1 -
+ board/coreboot/Kconfig               | 1 -
+ board/dbau1x00/Kconfig               | 1 -
+ board/google/Kconfig                 | 1 -
+ board/intel/Kconfig                  | 1 -
+ board/micronas/vct/Kconfig           | 1 -
+ board/seco/Kconfig                   | 2 --
+ board/sunxi/Kconfig                  | 1 -
+ 53 files changed, 55 deletions(-)
+
+diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
+index 925e312..640cda8 100644
+--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
+@@ -129,7 +129,6 @@ config ARC_CACHE_LINE_SHIFT
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_TB100
+ 	bool "Support tb100"
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index 9908b43..8eeb46c 100644
+--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
+@@ -64,7 +64,6 @@ config SEMIHOSTING
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config ARCH_AT91
+ 	bool "Atmel AT91"
+diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
+index 4a7d82f..f2fe748 100644
+--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
+@@ -2,7 +2,6 @@ if ARCH_EXYNOS
+ 
+ choice
+ 	prompt "EXYNOS board select"
+-	optional
+ 
+ config TARGET_SMDKV310
+ 	select SUPPORT_SPL
+diff --git a/arch/arm/cpu/armv7/mx5/Kconfig b/arch/arm/cpu/armv7/mx5/Kconfig
+index 9f250c6..2d6c0ce 100644
+--- a/arch/arm/cpu/armv7/mx5/Kconfig
+++ b/arch/arm/cpu/armv7/mx5/Kconfig
+@@ -12,7 +12,6 @@ config MX53
+ 
+ choice
+ 	prompt "MX5 board select"
+-	optional
+ 
+ config TARGET_USBARMORY
+ 	bool "Support USB armory"
+diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
+index 10908c4..662596f 100644
+--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
+@@ -27,7 +27,6 @@ config MX6SX
+ 
+ choice
+ 	prompt "MX6 board select"
+-	optional
+ 
+ config TARGET_SECOMX6
+ 	bool "Support secomx6 boards"
+diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig
+index b32a6b0..cc82c50 100644
+--- a/arch/arm/cpu/armv7/omap3/Kconfig
+++ b/arch/arm/cpu/armv7/omap3/Kconfig
+@@ -2,7 +2,6 @@ if OMAP34XX
+ 
+ choice
+ 	prompt "OMAP3 board select"
+-	optional
+ 
+ config TARGET_AM3517_EVM
+ 	bool "AM3517 EVM"
+diff --git a/arch/arm/cpu/armv7/omap4/Kconfig b/arch/arm/cpu/armv7/omap4/Kconfig
+index df27ea1..eccf897 100644
+--- a/arch/arm/cpu/armv7/omap4/Kconfig
+++ b/arch/arm/cpu/armv7/omap4/Kconfig
+@@ -2,7 +2,6 @@ if OMAP44XX
+ 
+ choice
+ 	prompt "OMAP4 board select"
+-	optional
+ 
+ config TARGET_DUOVERO
+ 	bool "OMAP4430 Gumstix Duovero"
+diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig
+index 20c3bd9..aca862d 100644
+--- a/arch/arm/cpu/armv7/omap5/Kconfig
+++ b/arch/arm/cpu/armv7/omap5/Kconfig
+@@ -2,7 +2,6 @@ if OMAP54XX
+ 
+ choice
+ 	prompt "OMAP5 board select"
+-	optional
+ 
+ config TARGET_CM_T54
+ 	bool "CompuLab CM-T54"
+diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/cpu/armv7/rmobile/Kconfig
+index ef56286..638b63d 100644
+--- a/arch/arm/cpu/armv7/rmobile/Kconfig
+++ b/arch/arm/cpu/armv7/rmobile/Kconfig
+@@ -2,7 +2,6 @@ if RMOBILE
+ 
+ choice
+ 	prompt "Renesus ARM SoCs board select"
+-	optional
+ 
+ config TARGET_ARMADILLO_800EVA
+ 	bool "armadillo 800 eva board"
+diff --git a/arch/arm/cpu/armv7/s5pc1xx/Kconfig b/arch/arm/cpu/armv7/s5pc1xx/Kconfig
+index 792ef59..65cc9eb 100644
+--- a/arch/arm/cpu/armv7/s5pc1xx/Kconfig
+++ b/arch/arm/cpu/armv7/s5pc1xx/Kconfig
+@@ -2,7 +2,6 @@ if ARCH_S5PC1XX
+ 
+ choice
+ 	prompt "S5PC1XX board select"
+-	optional
+ 
+ config TARGET_S5P_GONI
+ 	bool "S5P Goni board"
+diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
+index bbf4228..5dc2cb2 100644
+--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
+@@ -2,7 +2,6 @@ if ARCH_AT91
+ 
+ choice
+ 	prompt "Atmel AT91 board select"
+-	optional
+ 
+ config TARGET_AT91RM9200EK
+ 	bool "Atmel AT91RM9200 evaluation kit"
+diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
+index 2315a13..d40f505 100644
+--- a/arch/arm/mach-bcm283x/Kconfig
+++ b/arch/arm/mach-bcm283x/Kconfig
+@@ -3,7 +3,6 @@ menu "Broadcom BCM283X family"
+ 
+ choice
+ 	prompt "Broadcom BCM283X board select"
+-	optional
+ 
+ config TARGET_RPI
+ 	bool "Raspberry Pi"
+diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
+index e6cb390..3ef55d3 100644
+--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
+@@ -2,7 +2,6 @@ if ARCH_DAVINCI
+ 
+ choice
+ 	prompt "DaVinci board select"
+-	optional
+ 
+ config TARGET_ENBW_CMC
+ 	bool "EnBW CMC board"
+diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
+index c54d69d..8ffc544 100644
+--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
+@@ -3,7 +3,6 @@ menu "Integrator Options"
+ 
+ choice
+ 	prompt "Integrator platform select"
+-	optional
+ 
+ config ARCH_INTEGRATOR_AP
+ 	bool "Support Integrator/AP platform"
+@@ -19,7 +18,6 @@ config ARCH_CINTEGRATOR
+ 
+ choice
+ 	prompt "Integrator core module select"
+-	optional
+ 
+ config CM720T
+ 	bool "Core Module for ARM720T"
+diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
+index 67f1a33..134ae87 100644
+--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
+@@ -2,7 +2,6 @@ if ARCH_KEYSTONE
+ 
+ choice
+ 	prompt "TI Keystone board select"
+-	optional
+ 
+ config TARGET_K2HK_EVM
+ 	bool "TI Keystone 2 Kepler/Hawking EVM"
+diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
+index 1261885..45c6687 100644
+--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
+@@ -2,7 +2,6 @@ if KIRKWOOD
+ 
+ choice
+ 	prompt "Marvell Kirkwood board select"
+-	optional
+ 
+ config TARGET_OPENRD
+ 	bool "Marvell OpenRD Board"
+diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig
+index ba72a41..265f336 100644
+--- a/arch/arm/mach-nomadik/Kconfig
+++ b/arch/arm/mach-nomadik/Kconfig
+@@ -2,7 +2,6 @@ if ARCH_NOMADIK
+ 
+ choice
+ 	prompt "Nomadik board select"
+-	optional
+ 
+ config NOMADIK_NHK8815
+ 	bool "ST 8815 Nomadik Hardware Kit"
+diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
+index 7644b8d..291c511 100644
+--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
+@@ -2,7 +2,6 @@ if ORION5X
+ 
+ choice
+ 	prompt "Marvell Orion board select"
+-	optional
+ 
+ config TARGET_EDMINIV2
+ 	bool "LaCie Ethernet Disk mini V2"
+diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
+index e46c348..204efca 100644
+--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
+@@ -2,7 +2,6 @@ if ARCH_SOCFPGA
+ 
+ choice
+ 	prompt "Altera SOCFPGA board select"
+-	optional
+ 
+ config TARGET_SOCFPGA_ARRIA5
+ 	bool "Altera SOCFPGA Arria V"
+diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
+index 54bd648..ef77c84 100644
+--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
+@@ -2,7 +2,6 @@ if TEGRA
+ 
+ choice
+ 	prompt "Tegra SoC select"
+-	optional
+ 
+ config TEGRA20
+ 	bool "Tegra20 family"
+diff --git a/arch/arm/mach-tegra/tegra114/Kconfig b/arch/arm/mach-tegra/tegra114/Kconfig
+index 1047b92..31012bc 100644
+--- a/arch/arm/mach-tegra/tegra114/Kconfig
+++ b/arch/arm/mach-tegra/tegra114/Kconfig
+@@ -2,7 +2,6 @@ if TEGRA114
+ 
+ choice
+ 	prompt "Tegra114 board select"
+-	optional
+ 
+ config TARGET_DALMORE
+ 	bool "NVIDIA Tegra114 Dalmore evaluation board"
+diff --git a/arch/arm/mach-tegra/tegra124/Kconfig b/arch/arm/mach-tegra/tegra124/Kconfig
+index f3324ff..86c1301 100644
+--- a/arch/arm/mach-tegra/tegra124/Kconfig
+++ b/arch/arm/mach-tegra/tegra124/Kconfig
+@@ -2,7 +2,6 @@ if TEGRA124
+ 
+ choice
+ 	prompt "Tegra124 board select"
+-	optional
+ 
+ config TARGET_JETSON_TK1
+ 	bool "NVIDIA Tegra124 Jetson TK1 board"
+diff --git a/arch/arm/mach-tegra/tegra20/Kconfig b/arch/arm/mach-tegra/tegra20/Kconfig
+index 1bb8dff..7f09f81 100644
+--- a/arch/arm/mach-tegra/tegra20/Kconfig
+++ b/arch/arm/mach-tegra/tegra20/Kconfig
+@@ -2,7 +2,6 @@ if TEGRA20
+ 
+ choice
+ 	prompt "Tegra20 board select"
+-	optional
+ 
+ config TARGET_HARMONY
+ 	bool "NVIDIA Tegra20 Harmony evaluation board"
+diff --git a/arch/arm/mach-tegra/tegra30/Kconfig b/arch/arm/mach-tegra/tegra30/Kconfig
+index e78331e..3abdc7b 100644
+--- a/arch/arm/mach-tegra/tegra30/Kconfig
+++ b/arch/arm/mach-tegra/tegra30/Kconfig
+@@ -2,7 +2,6 @@ if TEGRA30
+ 
+ choice
+ 	prompt "Tegra30 board select"
+-	optional
+ 
+ config TARGET_APALIS_T30
+ 	bool "Toradex Apalis T30 board"
+diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
+index 1de5b07..6b0e295 100644
+--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
+@@ -10,7 +10,6 @@ config ZYNQ_CUSTOM_INIT
+ 
+ choice
+ 	prompt "Xilinx Zynq board select"
+-	optional
+ 
+ config TARGET_ZYNQ_ZED
+ 	bool "Zynq ZedBoard"
+diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
+index eb33774..801b9cc 100644
+--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
+@@ -6,7 +6,6 @@ config SYS_ARCH
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_ATNGW100
+ 	bool "Support atngw100"
+diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
+index 0a2fb4d..31913fe 100644
+--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
+@@ -6,7 +6,6 @@ config SYS_ARCH
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_BCT_BRETTL2
+ 	bool "Support bct-brettl2"
+diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
+index 26509b7..69cb0f7 100644
+--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
+@@ -114,7 +114,6 @@ config M548x
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_M52277EVB
+ 	bool "Support M52277EVB"
+diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
+index 077b2a7..6f419f0 100644
+--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
+@@ -6,7 +6,6 @@ config SYS_ARCH
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_MICROBLAZE_GENERIC
+ 	bool "Support microblaze-generic"
+diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
+index 7f7e258..87b94ac 100644
+--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
+@@ -10,7 +10,6 @@ config SYS_CPU
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_QEMU_MIPS
+ 	bool "Support qemu-mips"
+diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig
+index 98b0282..81b0a01 100644
+--- a/arch/nds32/Kconfig
+++ b/arch/nds32/Kconfig
+@@ -6,7 +6,6 @@ config SYS_ARCH
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_ADP_AG101
+ 	bool "Support adp-ag101"
+diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
+index 8ae7f6e..b3be7b5 100644
+--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
+@@ -6,7 +6,6 @@ config SYS_ARCH
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_NIOS2_GENERIC
+ 	bool "Support nios2-generic"
+diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
+index 11014d1..4d62b4c 100644
+--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
+@@ -6,7 +6,6 @@ config SYS_ARCH
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_OPENRISC_GENERIC
+ 	bool "Support openrisc-generic"
+diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
+index 3b3f446..8e5a3e2 100644
+--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
+@@ -6,7 +6,6 @@ config SYS_ARCH
+ 
+ choice
+ 	prompt "CPU select"
+-	optional
+ 
+ config MPC512X
+ 	bool "MPC512X"
+diff --git a/arch/powerpc/cpu/mpc512x/Kconfig b/arch/powerpc/cpu/mpc512x/Kconfig
+index 53450ae..a0f0ede 100644
+--- a/arch/powerpc/cpu/mpc512x/Kconfig
+++ b/arch/powerpc/cpu/mpc512x/Kconfig
+@@ -6,7 +6,6 @@ config SYS_CPU
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_PDM360NG
+ 	bool "Support pdm360ng"
+diff --git a/arch/powerpc/cpu/mpc5xx/Kconfig b/arch/powerpc/cpu/mpc5xx/Kconfig
+index 5275447..aad4a7c 100644
+--- a/arch/powerpc/cpu/mpc5xx/Kconfig
+++ b/arch/powerpc/cpu/mpc5xx/Kconfig
+@@ -6,7 +6,6 @@ config SYS_CPU
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_CMI_MPC5XX
+ 	bool "Support cmi_mpc5xx"
+diff --git a/arch/powerpc/cpu/mpc5xxx/Kconfig b/arch/powerpc/cpu/mpc5xxx/Kconfig
+index 5d49228..eec9d7d 100644
+--- a/arch/powerpc/cpu/mpc5xxx/Kconfig
+++ b/arch/powerpc/cpu/mpc5xxx/Kconfig
+@@ -6,7 +6,6 @@ config SYS_CPU
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_A3M071
+ 	bool "Support a3m071"
+diff --git a/arch/powerpc/cpu/mpc8260/Kconfig b/arch/powerpc/cpu/mpc8260/Kconfig
+index e93732d..55941c8 100644
+--- a/arch/powerpc/cpu/mpc8260/Kconfig
+++ b/arch/powerpc/cpu/mpc8260/Kconfig
+@@ -6,7 +6,6 @@ config SYS_CPU
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_KM82XX
+ 	bool "Support km82xx"
+diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
+index 3fb901f..88a3bd6 100644
+--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
+@@ -6,7 +6,6 @@ config SYS_CPU
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_MPC8308_P1M
+ 	bool "Support mpc8308_p1m"
+diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
+index 3e8d0b1..aff5fdb 100644
+--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
+@@ -6,7 +6,6 @@ config SYS_CPU
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_SBC8548
+ 	bool "Support sbc8548"
+diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig
+index fe1859d..14e8b1a 100644
+--- a/arch/powerpc/cpu/mpc86xx/Kconfig
+++ b/arch/powerpc/cpu/mpc86xx/Kconfig
+@@ -6,7 +6,6 @@ config SYS_CPU
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_SBC8641D
+ 	bool "Support sbc8641d"
+diff --git a/arch/powerpc/cpu/mpc8xx/Kconfig b/arch/powerpc/cpu/mpc8xx/Kconfig
+index 79cee35..e8bcbe9 100644
+--- a/arch/powerpc/cpu/mpc8xx/Kconfig
+++ b/arch/powerpc/cpu/mpc8xx/Kconfig
+@@ -6,7 +6,6 @@ config SYS_CPU
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_TQM823L
+ 	bool "Support TQM823L"
+diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig
+index 10b86e0..4d5954a 100644
+--- a/arch/powerpc/cpu/ppc4xx/Kconfig
+++ b/arch/powerpc/cpu/ppc4xx/Kconfig
+@@ -6,7 +6,6 @@ config SYS_CPU
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_CSB272
+ 	bool "Support csb272"
+diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
+index 6ac22af..ff8f5b5 100644
+--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
+@@ -29,7 +29,6 @@ config SH_32BIT
+ 
+ choice
+ 	prompt "Target select"
+-	optional
+ 
+ config TARGET_RSK7203
+ 	bool "RSK+ 7203"
+diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
+index 04dc08f..2df09b2 100644
+--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
+@@ -14,7 +14,6 @@ config LEON3
+ 
+ choice
+ 	prompt "Board select"
+-	optional
+ 
+ config TARGET_GRSIM_LEON2
+ 	bool "GRSIM simulating a LEON2 board"
+diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig
+index a655dbc..ef66ad4 100644
+--- a/board/amcc/canyonlands/Kconfig
+++ b/board/amcc/canyonlands/Kconfig
+@@ -11,7 +11,6 @@ config SYS_CONFIG_NAME
+ 
+ choice BOARD_TYPE
+ 	prompt "Select which board to build for"
+-	optional
+ 
+ config CANYONLANDS
+ 	bool "Glacier"
+diff --git a/board/coreboot/Kconfig b/board/coreboot/Kconfig
+index ede6065..dc9b70f 100644
+--- a/board/coreboot/Kconfig
+++ b/board/coreboot/Kconfig
+@@ -8,7 +8,6 @@ if VENDOR_COREBOOT
+ 
+ choice
+ 	prompt "Mainboard model"
+-	optional
+ 
+ config TARGET_COREBOOT
+ 	bool "coreboot"
+diff --git a/board/dbau1x00/Kconfig b/board/dbau1x00/Kconfig
+index b813adb..1286e45 100644
+--- a/board/dbau1x00/Kconfig
+++ b/board/dbau1x00/Kconfig
+@@ -13,7 +13,6 @@ menu "dbau1x00 board options"
+ 
+ choice
+ 	prompt "Select au1x00 SoC type"
+-	optional
+ 
+ config DBAU1100
+ 	bool "Select AU1100"
+diff --git a/board/google/Kconfig b/board/google/Kconfig
+index e9559c9..302f68e 100644
+--- a/board/google/Kconfig
+++ b/board/google/Kconfig
+@@ -8,7 +8,6 @@ if VENDOR_GOOGLE
+ 
+ choice
+ 	prompt "Mainboard model"
+-	optional
+ 
+ config TARGET_CHROMEBOOK_LINK
+ 	bool "Chromebook link"
+diff --git a/board/intel/Kconfig b/board/intel/Kconfig
+index 3d9ecf0..7fe21b9 100644
+--- a/board/intel/Kconfig
+++ b/board/intel/Kconfig
+@@ -8,7 +8,6 @@ if VENDOR_INTEL
+ 
+ choice
+ 	prompt "Mainboard model"
+-	optional
+ 
+ config TARGET_CROWNBAY
+ 	bool "Crown Bay"
+diff --git a/board/micronas/vct/Kconfig b/board/micronas/vct/Kconfig
+index c518079..288a1ae 100644
+--- a/board/micronas/vct/Kconfig
+++ b/board/micronas/vct/Kconfig
+@@ -13,7 +13,6 @@ menu "vct board options"
+ 
+ choice
+ 	prompt "Board variant"
+-	optional
+ 
+ config VCT_PLATINUM
+ 	bool "Enable VCT_PLATINUM"
+diff --git a/board/seco/Kconfig b/board/seco/Kconfig
+index af16697..dcb1ac8 100644
+--- a/board/seco/Kconfig
+++ b/board/seco/Kconfig
+@@ -2,7 +2,6 @@ if TARGET_SECOMX6
+ 
+ choice
+ 	prompt "SECO i.MX6 Board variant"
+-	optional
+ 
+ config SECOMX6_Q7
+ 	bool "Q7"
+@@ -17,7 +16,6 @@ endchoice
+ 
+ choice
+ 	prompt "SECO i.MX6 SoC variant"
+-	optional
+ 
+ config SECOMX6Q
+ 	bool "i.MX6Q"
+diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
+index 2a1cd3c..808de26 100644
+--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
+@@ -18,7 +18,6 @@ config SUNXI_GEN_SUN6I
+ 
+ choice
+ 	prompt "Sunxi SoC Variant"
+-	optional
+ 
+ config MACH_SUN4I
+ 	bool "sun4i (Allwinner A10)"
+-- 
+2.4.3
+
@@ -28,8 +28,9 @@ There are a few non-trivial blocks:
  * c: a character device file
  * b: a block device file
  * p: a named pipe
- +mode+, +uid+ and +gid+ are the usual permissions settings
- +major+ and +minor+ are here for device files - set to - for other
+- +mode+, +uid+ and +gid+ are the usual permissions settings (only
+  numerical values are allowed)
+- +major+ and +minor+ are here for device files, set to +-+ for other
  files
 - +start+, +inc+ and +count+ are for when you want to create a batch
  of files, and can be reduced to a loop, beginning at +start+,
@@ -43,10 +44,12 @@ this syntax, you will need to put:
 ----

 Alternatively, if you want to change owner/permission of a directory
-recursively, you can put:
+recursively, you can put (to set UID to 123, GID to 456 and access
+rights to rwxr-x--- for the directory /usr/share/myapp and all files
+and directories below it):

 ----
-/usr/share/myapp r 750 myuser myuser - - - - -
+/usr/share/myapp r 750 123 456 - - - - -
 ----

 On the other hand, if you want to create the device file +/dev/hda+
@@ -26,7 +26,7 @@ There are many different ways to contribute:</p>
 </ul>

 <p>For more details on these topics, check out the
-<a href="http://buildroot.uclibc.org/downloads/manual/manual.html#_contributing_to_buildroot">
+<a href="http://buildroot.org/manual.html#_contributing_to_buildroot">
 Contributing to buildroot</a> chapter in the Buildroot manual. Thanks for your help!</p>

 <p>If you need any support yourself, have a look at <a href="./support.html">
@@ -11,7 +11,7 @@ things. It is available as:</p>

 <h4>Latest stable release</h4>
 <ul>
-  <li><a href="/downloads/manual/manual.html">Online HTML</a></li>
+  <li><a href="/manual.html">Online HTML</a></li>
  <li><a href="/downloads/manual/manual.pdf">PDF document</a></li>
  <li><a href="/downloads/manual/manual.text">ASCII text</a></li>
 </ul>
@@ -7,26 +7,26 @@

 <p>

-The latest stable release is <b>2015.05</b>, which can be downloaded
+The latest stable release is <b>2015.08</b>, which can be downloaded
 here:<p>

-<a href="/downloads/buildroot-2015.05.tar.gz">buildroot-2015.05.tar.gz</a>
-(<a href="/downloads/buildroot-2015.05.tar.gz.sign">PGP signature</a>)
+<a href="/downloads/buildroot-2015.08.tar.gz">buildroot-2015.08.tar.gz</a>
+(<a href="/downloads/buildroot-2015.08.tar.gz.sign">PGP signature</a>)
 or
-<a href="/downloads/buildroot-2015.05.tar.bz2">buildroot-2015.05.tar.bz2</a>
-(<a href="/downloads/buildroot-2015.05.tar.bz2.sign">PGP signature</a>).
-
+<a href="/downloads/buildroot-2015.08.tar.bz2">buildroot-2015.08.tar.bz2</a>
+(<a href="/downloads/buildroot-2015.08.tar.bz2.sign">PGP signature</a>).
+<!--
 <p>
-The latest release candidate is <b>2015.08-rc1</b>, which can be
+The latest release candidate is <b>2015.08-rc2</b>, which can be
 downloaded here:<p>

-<a href="/downloads/buildroot-2015.08-rc1.tar.gz">buildroot-2015.08-rc1.tar.gz</a>
-(<a href="/downloads/buildroot-2015.08-rc1.tar.gz.sign">PGP signature</a>)
+<a href="/downloads/buildroot-2015.08-rc2.tar.gz">buildroot-2015.08-rc1.tar.gz</a>
+(<a href="/downloads/buildroot-2015.08-rc2.tar.gz.sign">PGP signature</a>)
 or
-<a href="/downloads/buildroot-2015.08-rc1.tar.bz2">buildroot-2015.08-rc1.tar.bz2</a>
-(<a href="/downloads/buildroot-2015.08-rc1.tar.bz2.sign">PGP signature</a>).
+<a href="/downloads/buildroot-2015.08-rc2.tar.bz2">buildroot-2015.08-rc1.tar.bz2</a>
+(<a href="/downloads/buildroot-2015.08-rc2.tar.bz2.sign">PGP signature</a>).
 <p>
-
+-->
 This and earlier releases (and their PGP signatures) can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.

@@ -8,12 +8,37 @@
 <p>

 <ul>
+  <li><b>31 August 2015 -- 2015.08 released</b>
+
+    <p>The stable 2015.08 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2015.08">CHANGES</a>
+    file for more details,
+    and go to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2015.08.tar.bz2">2015.08 release</a>.</p>
+
+  <li><b>24 August 2015 -- 2015.08-rc2 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see
+    the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2015.08-rc2">CHANGES</a>
+    file for details, and
+    the <a href="http://lists.busybox.net/pipermail/buildroot/2015-August/137879.html">release
+    announcement</a>.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2015.08-rc2.tar.bz2">2015.08-rc2
+    release candidate</a>, and report any problems found to the
+    <a href="support.html">mailing list</a> or
+    <a href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
  <li><b>5 August 2015 -- 2015.08-rc1 released</b>

    <p>We have a new release candidate! Lots of changes all over the
-    tree, see the <a
-    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2015.08-rc1">CHANGES</a>
-    file for details.</p>
+    tree, see
+    the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2015.08-rc1">CHANGES</a>
+    file for details, read
+    the <a href="http://lists.busybox.net/pipermail/buildroot/2015-August/135417.html">announcement</a>.</p>

    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
    <a href="/downloads/buildroot-2015.08-rc1.tar.bz2">2015.08-rc1
@@ -16,6 +16,9 @@
 #  ROOTFS_$(FSTYPE)_PRE_GEN_HOOKS, a list of hooks to call before
 #  generating the filesystem image
 #
+#  ROOTFS_$(FSTYPE)_POST_GEN_HOOKS, a list of hooks to call after
+#  generating the filesystem image
+#
 #  ROOTFS_$(FSTYPE)_POST_TARGETS, the list of targets that should be
 #  run after running the main filesystem target. This is useful for
 #  initramfs, to rebuild the kernel once the initramfs is generated.
@@ -96,6 +99,7 @@ endif
 ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),)
 	PATH=$$(BR_PATH) $$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT)
 endif
+	$$(foreach hook,$$(ROOTFS_$(2)_POST_GEN_HOOKS),$$(call $$(hook))$$(sep))

 rootfs-$(1)-show-depends:
 	@echo $$(ROOTFS_$(2)_DEPENDENCIES)
@@ -47,13 +47,14 @@ config BR2_TARGET_ROOTFS_ISO9660_ISOLINUX
 endchoice

 config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
-	string "Boot menu.lst file"
+	string "Boot menu config file"
 	default "fs/iso9660/menu.lst" if BR2_TARGET_ROOTFS_ISO9660_GRUB
 	default "fs/iso9660/grub.cfg" if BR2_TARGET_ROOTFS_ISO9660_GRUB2
 	default "fs/iso9660/isolinux.cfg" if BR2_TARGET_ROOTFS_ISO9660_ISOLINUX
 	help
 	  Use this option to provide a custom bootloader configuration
-	  file (menu.lst for Grub, isolinux.cfg for isolinux).
+	  file (menu.lst for Grub, grub.cfg for Grub 2, isolinux.cfg for
+	  isolinux).

 	  Note that the strings __KERNEL_PATH__ and __INITRD_PATH__
 	  will automatically be replaced by the path to the kernel and
@@ -215,6 +215,7 @@ define LINUX_KCONFIG_FIXUP_CMDS
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES,$(@D)/.config))
 	$(if $(BR2_PACKAGE_XTABLES_ADDONS),
+		$(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK,$(@D)/.config))
 	$(if $(BR2_LINUX_KERNEL_APPENDED_DTB),
@@ -826,6 +826,7 @@ menu "Graphics"
 	source "package/libvips/Config.in"
 	source "package/menu-cache/Config.in"
 	source "package/opencv/Config.in"
+	source "package/opencv3/Config.in"
 	source "package/opengl/Config.in"
 	source "package/openjpeg/Config.in"
 	source "package/pango/Config.in"
@@ -852,6 +853,7 @@ menu "Hardware handling"
 	source "package/libfreefare/Config.in"
 	source "package/libftdi/Config.in"
 	source "package/libftdi1/Config.in"
+	source "package/libgudev/Config.in"
 	source "package/libhid/Config.in"
 	source "package/libiio/Config.in"
 	source "package/libinput/Config.in"
@@ -1371,6 +1373,17 @@ endif
 endmenu

 menu "Package managers"
+comment "-------------------------------------------------------"
+comment "Please note:                                           "
+comment "- Buildroot does *not* generate binary packages,       "
+comment "- Buildroot does *not* install any package database.   "
+comment "*                                                      "
+comment "It is up to you to provide those by yourself if you    "
+comment "want to use any of those package managers.             "
+comment "*                                                      "
+comment "See the manual:                                        "
+comment "http://buildroot.org/manual.html#faq-no-binary-packages"
+comment "-------------------------------------------------------"
 	source "package/ipkg/Config.in"
 	source "package/opkg/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
@@ -4,7 +4,7 @@
 #
 ################################################################################

-APITRACE_VERSION = c181b7fbf4b1c3912424761fec8ac7124640543a
+APITRACE_VERSION = 7.0
 APITRACE_SITE = $(call github,apitrace,apitrace,$(APITRACE_VERSION))
 APITRACE_LICENSE = MIT
 APITRACE_LICENSE_FILES = LICENSE
@@ -8,6 +8,8 @@ config BR2_PACKAGE_AUDIT
 	bool "audit"
 	depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_STATIC_LIBS
+	depends on !BR2_TOOLCHAIN_USES_MUSL
 	help
 	  The audit package contains the user space utilities for
 	  storing and searching the audit records generated by
@@ -17,6 +19,7 @@ config BR2_PACKAGE_AUDIT

 	  http://people.redhat.com/sgrubb/audit/

-comment "audit needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "audit needs a uClibc or (e)glibc toolchain w/ threads, dynamic library"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
+		|| BR2_TOOLCHAIN_USES_MUSL
 	depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS
@@ -8,12 +8,14 @@ config BR2_PACKAGE_AVRDUDE
 	depends on BR2_USE_WCHAR # elfutils
 	depends on !BR2_STATIC_LIBS # elfutils
 	depends on !BR2_bfin # elfutils
+	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
 	help
 	  avrdude is a programmer for Atmel AVR microcontrollers
 	  this package provides a version with new linuxspi driver

 	  https://github.com/kcuzner/avrdude

-comment "avrdude needs a toolchain w/ threads, wchar, dynamic library"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS
+comment "avrdude needs a uclibc or (e)glibc toolchain w/ threads, wchar, dynamic library"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS \
+		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
 	depends on !BR2_bfin
@@ -0,0 +1,48 @@
+From c36db3f798bf576f42d81a0c51198b17d7112e8c Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 8 Aug 2015 17:43:28 +0200
+Subject: [PATCH] Do not use the non-standard <sys/cdefs.h> header
+
+<sys/cdefs.h> is glibc-specific, and should be used only internally by
+glibc, not by external libraries/programs. It is not available in all
+standard C libraries.
+
+Submitted upstream: https://sourceforge.net/p/bcusdk/patches/3/
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ eibd/include/eibclient.h | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/eibd/include/eibclient.h b/eibd/include/eibclient.h
+index 2781878..b095a1c 100644
+--- a/eibd/include/eibclient.h
+++ b/eibd/include/eibclient.h
+@@ -27,10 +27,11 @@
+ #ifndef EIBCLIENT_H
+ #define EIBCLIENT_H
+ 
+-#include <sys/cdefs.h>
+ #include <stdint.h>
+ 
+-__BEGIN_DECLS;
+#ifdef	__cplusplus
+extern "C" {
+#endif
+ 
+ #include "eibloadresult.h"
+ 
+@@ -889,5 +890,9 @@ int EIB_Cache_LastUpdates_async (EIBConnection * con, uint16_t start,
+ 				 uint16_t * end);
+ 
+ 
+-__END_DECLS
+
+#ifdef	__cplusplus
+}
+#endif
+
+ #endif
+-- 
+2.5.0
+
@@ -0,0 +1,31 @@
+From 2541ee3d709803096b17e45610ccc1404e2e5eee Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 8 Aug 2015 17:46:34 +0200
+Subject: [PATCH] fd_set requires inclusion of <sys/select.h>
+
+According to POSIX.1-2001, the definition fd_set and related macros is
+in <sys/select.h>, so it should be included in files using fd_set to
+make the code compatible with all standard C libraries.
+
+Submitted upstream: https://sourceforge.net/p/bcusdk/patches/3/
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ eibd/examples/common.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/eibd/examples/common.h b/eibd/examples/common.h
+index 51fc514..f038da1 100644
+--- a/eibd/examples/common.h
+++ b/eibd/examples/common.h
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <unistd.h>
+#include <sys/select.h>
+ #include "eibclient.h"
+ 
+ /** unsigned char*/
+-- 
+2.5.0
+
@@ -3,7 +3,7 @@ config BR2_PACKAGE_BCUSDK
 	depends on BR2_USE_MMU # libpthsem
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_LIBPTHSEM
-	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
+	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
 	help
 	  A free development environment for the Bus Coupling Units of
 	  the European Installation Bus.
@@ -0,0 +1,61 @@
+From c887470e0e3310c81ecdb7e736bc5d2ead45db2a Mon Sep 17 00:00:00 2001
+From: Ivan Maidanski <ivmai@mail.ru>
+Date: Mon, 6 Apr 2015 20:06:47 +0300
+Subject: [PATCH 1/1] Do not include sigcontext.h and asm/sigcontext.h (these
+ Linux headers define sigcontext which is no longer used as replaced with
+ ucontext_t in GC 7.0alpha1)
+
+* os_dep.c: Do not include linux/version.h (do not test
+LINUX_VERSION_CODE), asm/signal.h, sigcontext.h, asm/sigcontext.h
+since struct sigcontext not used in GC v7+.
+
+Signed-off-by: Brendan Heading <brendanheading@gmail.com>
+Upstream-status: backport
+---
+ os_dep.c | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
+
+diff --git a/os_dep.c b/os_dep.c
+index f62d4ed..a1bafbd 100644
+--- a/os_dep.c
+++ b/os_dep.c
+@@ -16,36 +16,6 @@
+ 
+ #include "private/gc_priv.h"
+ 
+-#if defined(LINUX) && !defined(POWERPC) && !defined(NO_SIGCONTEXT_H)
+-# include <linux/version.h>
+-# if (LINUX_VERSION_CODE <= 0x10400)
+-    /* Ugly hack to get struct sigcontext_struct definition.  Required  */
+-    /* for some early 1.3.X releases.  Will hopefully go away soon.     */
+-    /* in some later Linux releases, asm/sigcontext.h may have to       */
+-    /* be included instead.                                             */
+-#   define __KERNEL__
+-#   include <asm/signal.h>
+-#   undef __KERNEL__
+-# else
+-    /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
+-    /* struct sigcontext.  libc6 (glibc2) uses "struct sigcontext" in     */
+-    /* prototypes, so we have to include the top-level sigcontext.h to    */
+-    /* make sure the former gets defined to be the latter if appropriate. */
+-#   include <features.h>
+-#   if 2 <= __GLIBC__
+-#     if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__
+-        /* glibc 2.1 no longer has sigcontext.h.  But signal.h          */
+-        /* has the right declaration for glibc 2.1.                     */
+-#       include <sigcontext.h>
+-#     endif /* 0 == __GLIBC_MINOR__ */
+-#   else /* __GLIBC__ < 2 */
+-      /* libc5 doesn't have <sigcontext.h>: go directly with the kernel   */
+-      /* one.  Check LINUX_VERSION_CODE to see which we should reference. */
+-#     include <asm/sigcontext.h>
+-#   endif /* __GLIBC__ < 2 */
+-# endif
+-#endif /* LINUX && !POWERPC */
+-
+ #if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MACOS) \
+     && !defined(MSWINCE) && !defined(__CC_ARM)
+ # include <sys/types.h>
+-- 
+2.4.3
+
@@ -17,13 +17,15 @@ config BR2_PACKAGE_BEECRYPT_CPP
 	depends on BR2_USE_WCHAR # icu
 	depends on !BR2_BINFMT_FLAT # icu
 	depends on BR2_ARCH_HAS_ATOMICS # icu
+	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_ICU
 	help
 	  Enable C++ support. This pulls in the (large) icu package.

-comment "C++ support needs a toolchain w/ wchar"
+comment "C++ support needs a toolchain w/ C++, wchar, dynamic libraries"
 	depends on !BR2_BINFMT_FLAT
 	depends on BR2_ARCH_HAS_ATOMICS
-	depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
+		|| BR2_STATIC_LIBS

 endif # BR2_PACKAGE_BEECRYPT
@@ -19,6 +19,7 @@ BEECRYPT_CONF_OPTS = \

 ifeq ($(BR2_PACKAGE_BEECRYPT_CPP),y)
 BEECRYPT_DEPENDENCIES += icu
+BEECRYPT_CONF_OPTS += --with-cplusplus
 else
 BEECRYPT_CONF_OPTS += --without-cplusplus

@@ -0,0 +1,38 @@
+Use eventfd() function with uClibc
+
+The Boost eventfd code either directly makes the eventfd system call
+using __NR_eventfd (when __GLIBC_MINOR is less than 8), or otherwise
+uses the eventfd() function provided by the C library.
+
+However, since uClibc pretends to be glibc 2.2, the Boost eventfd code
+directly uses the system call. While it works fine on most
+architectures, it doesn't on ARC since __NR_eventfd is not defined on
+this architecture. However, eventfd() is properly implemented.
+
+So, this patch adjusts the logic used by Boost to consider uClibc as a
+C library providing the eventfd() function.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/boost/asio/detail/impl/eventfd_select_interrupter.ipp
+===================================================================
+--- a/boost/asio/detail/impl/eventfd_select_interrupter.ipp
+++ b/boost/asio/detail/impl/eventfd_select_interrupter.ipp
+@@ -23,7 +23,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <fcntl.h>
+-#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__)
+ # include <asm/unistd.h>
+ #else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8
+ # include <sys/eventfd.h>
+@@ -46,7 +46,7 @@
+ 
+ void eventfd_select_interrupter::open_descriptors()
+ {
+-#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__)
+   write_descriptor_ = read_descriptor_ = syscall(__NR_eventfd, 0);
+   if (read_descriptor_ != -1)
+   {
@@ -0,0 +1,31 @@
+From e4c2c18b9d1d7a6dc17d8f7705b26fc2e2efc5a9 Mon Sep 17 00:00:00 2001
+From: Brendan Heading <brendanheading@gmail.com>
+Date: Sun, 30 Aug 2015 20:12:40 +0100
+Subject: [PATCH 1/1] fix musl compilation issue
+
+makedev(3) requires sys/types.h to be included.
+
+Note upstream has not issued releases since 2009. No mailing list activity
+since January 2010, and even before then it seems to be mostly spam.
+
+Upstream-Status: dormant
+Signed-off-by: Brendan Heading <brendanheading@gmail.com>
+---
+ raidscan.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/raidscan.c b/raidscan.c
+index fab3b02..3cb1a0d 100644
+--- a/raidscan.c
+++ b/raidscan.c
+@@ -22,6 +22,7 @@
+ #include "config.h"
+ 
+ #include <sys/stat.h>
+#include <sys/types.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <linux/major.h>
+-- 
+2.4.3
+
@@ -36,6 +36,7 @@ config BR2_PACKAGE_BUSYBOX_SELINUX
 	select BR2_PACKAGE_LIBSELINUX
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
+	depends on !BR2_arc
 	bool "Enable SELinux support"
 	help
 	  Enable SELinux support in BusyBox. Please note that
@@ -5,4 +5,4 @@ config BR2_PACKAGE_BWM_NG
 	  network and disk-io bandwidth monitor for Linux, BSD,
 	  Solaris, Mac OS X and others.

-	  http://sourceforge.net/projects/bwmng/
+	  http://www.gropp.org/?id=projects&sub=bwm-ng
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  c1134358e268329d438b0996399003b0f0b966034fb4b5b138761c2f3c62ffdd  bwm-ng-0.6.tar.gz
+sha256  027cf3c960cd96fc9ffacdf7713df62d0fc55eeef4a1388289f8a62ae5e50df0  bwm-ng-0.6.1.tar.gz
@@ -4,8 +4,8 @@
 #
 ################################################################################

-BWM_NG_VERSION = 0.6
-BWM_NG_SITE = http://downloads.sourceforge.net/project/bwmng/bwmng/$(BWM_NG_VERSION)
+BWM_NG_VERSION = 0.6.1
+BWM_NG_SITE = http://www.gropp.org/bwm-ng
 BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats
 BWM_NG_LICENSE = GPLv2
 BWM_NG_LICENSE_FILES = COPYING
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_C_ICAP
 	bool "c-icap"
-	depends on !BR2_PREFER_STATIC_LIB
+	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	help
@@ -15,4 +15,4 @@ config BR2_PACKAGE_C_ICAP

 comment "c-icap needs a toolchain w/ threads and dynamic library"
 	depends on BR2_USE_MMU
-	depends on BR2_PREFER_STATIC_LIB  || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
@@ -0,0 +1,32 @@
+From 1d8cb0ad54099c3d7261aaa19a2c0786f16736d0 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 8 Aug 2015 22:42:39 +0200
+Subject: [PATCH] Add missing header for musl compatibility
+
+<linux/ioctl.h> is needed to get the definition of _IOC_SIZEBITS and
+solve the following build failure:
+
+src/spi.c: In function 'spi_transfer':
+src/spi.c:100:24: error: '_IOC_SIZEBITS' undeclared (first use in this function)
+     if (ioctl(spi->fd, SPI_IOC_MESSAGE(1), &spi_xfer) < 1)
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ src/spi.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/spi.c b/src/spi.c
+index 52a8d3d..1a6b17c 100644
+--- a/src/spi.c
+++ b/src/spi.c
+@@ -16,6 +16,7 @@
+ #include <errno.h>
+ 
+ #include <sys/ioctl.h>
+#include <linux/ioctl.h>
+ #include <linux/spi/spidev.h>
+ 
+ #include "spi.h"
+-- 
+2.5.0
+
@@ -0,0 +1,70 @@
+From 295316c3f44c3e779e85d7453424496a3bb4bc48 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 8 Aug 2015 22:56:09 +0200
+Subject: [PATCH] Fix build on SPARC
+
+On SPARC, the definitions of B2500000, B3000000, B3500000 and B4000000
+are not necessarily available, so use those values only if defined in
+the kernel headers.
+
+It fixes SPARC build failures such as:
+
+src/serial.c: In function '_serial_baudrate_to_bits':
+src/serial.c:73:30: error: 'B2500000' undeclared (first use in this function)
+         case 2500000: return B2500000;
+                              ^
+src/serial.c:73:30: note: each undeclared identifier is reported only once for each function it appears in
+src/serial.c:74:30: error: 'B3000000' undeclared (first use in this function)
+         case 3000000: return B3000000;
+                              ^
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ src/serial.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/src/serial.c b/src/serial.c
+index e385309..efd425e 100644
+--- a/src/serial.c
+++ b/src/serial.c
+@@ -70,10 +70,18 @@ static int _serial_baudrate_to_bits(uint32_t baudrate) {
+         case 1152000: return B1152000;
+         case 1500000: return B1500000;
+         case 2000000: return B2000000;
+#ifdef B2500000
+         case 2500000: return B2500000;
+#endif
+#ifdef B3000000
+         case 3000000: return B3000000;
+#endif
+#ifdef B3500000
+         case 3500000: return B3500000;
+#endif
+#ifdef B4000000
+         case 4000000: return B4000000;
+#endif
+         default: return -1;
+     }
+ }
+@@ -107,10 +115,18 @@ static int _serial_bits_to_baudrate(uint32_t bits) {
+         case B1152000: return 1152000;
+         case B1500000: return 1500000;
+         case B2000000: return 2000000;
+#ifdef B2500000
+         case B2500000: return 2500000;
+#endif
+#ifdef B3000000
+         case B3000000: return 3000000;
+#endif
+#ifdef B3500000
+         case B3500000: return 3500000;
+#endif
+#ifdef B4000000
+         case B4000000: return 4000000;
+#endif
+         default: return -1;
+     }
+ }
+-- 
+2.5.0
+
@@ -36,13 +36,13 @@ define CANFESTIVAL_CONFIGURE_CMDS
 endef

 define CANFESTIVAL_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all \
+	$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) all \
 		PYTHON=$(HOST_DIR)/usr/bin/python2
 endef

 define CANFESTIVAL_INSTALL_TARGET_CMDS
 	for d in $(CANFESTIVAL_INSTALLED-y) ; do \
-		$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$$d install \
+		$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/$$d install \
 			PYTHON=$(HOST_DIR)/usr/bin/python2 \
 			DESTDIR=$(TARGET_DIR) || exit 1 ; \
 	done
@@ -50,7 +50,7 @@ endef

 define CANFESTIVAL_INSTALL_STAGING_CMDS
 	for d in $(CANFESTIVAL_INSTALLED-y) ; do \
-		$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/$$d install \
+		$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/$$d install \
 			PYTHON=$(HOST_DIR)/usr/bin/python2 \
 			DESTDIR=$(STAGING_DIR) || exit 1 ; \
 	done
@@ -0,0 +1,47 @@
+From 9454ef47db30caa4359766c8730d9d92f65c64f7 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Sat, 8 Aug 2015 22:58:57 +0200
+Subject: [PATCH] define __THROW to avoid build issue with musl
+
+Fixes:
+http://autobuild.buildroot.net/results/d27/d2781e70b04a207e2e9397d888032294c7285034/build-end.log
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ genisoimage/sha256.h | 4 ++++
+ genisoimage/sha512.h | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/genisoimage/sha256.h b/genisoimage/sha256.h
+index e7f4cb9..bcae7ef 100644
+--- a/genisoimage/sha256.h
+++ b/genisoimage/sha256.h
+@@ -29,6 +29,10 @@
+ #include <stdint.h>
+ #include <stdio.h>
+ 
+/* define __THROW to avoid build issue when it's not available from the libc */
+#ifndef __THROW
+# define __THROW
+#endif
+ 
+ /* Structure to save state of computation between the single steps.  */
+ struct sha256_ctx
+diff --git a/genisoimage/sha512.h b/genisoimage/sha512.h
+index 7298355..8cee8b0 100644
+--- a/genisoimage/sha512.h
+++ b/genisoimage/sha512.h
+@@ -29,6 +29,10 @@
+ #include <stdint.h>
+ #include <stdio.h>
+ 
+/* define __THROW to avoid build issue when it's not available from the libc */
+#ifndef __THROW
+# define __THROW
+#endif
+ 
+ /* Structure to save state of computation between the single steps.  */
+ struct sha512_ctx
+-- 
+2.4.3
+
@@ -0,0 +1,31 @@
+From 6603cef0f06c450196a1bca06bb143d8fcda5651 Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Fri, 5 Dec 2014 23:19:29 +0100
+Subject: [PATCH 1/1] mtab.c: include <paths.h> for _PATH_MOUNTED
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Backported from: 6603cef0f06c450196a1bca06bb143d8fcda5651
+
+Signed-off-by: Felix Janda <felix.janda@posteo.de>
+Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+---
+ mtab.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mtab.c b/mtab.c
+index 7b365b3..a662a3c 100644
+--- a/mtab.c
+++ b/mtab.c
+@@ -38,6 +38,7 @@
+ #include <mntent.h>
+ #include <stdlib.h>
+ #include <signal.h>
+#include <paths.h>
+ #include "mount.h"
+ #include "config.h"
+ 
+-- 
+2.5.0
+
@@ -0,0 +1,24 @@
+uninit.c includes glibc-specific <fpu_control.h> not provided by musl.
+Somewhat portable replacement is <fenv.h>, which is available in musl
+but requires non-trivial changes to uninit.c.
+
+f2c uses _uninit_f2c() from uninit.c to implement its -trapuv option,
+pre-initializiing floating-point variables to NaN and asking FPU to send
+SIGFPE whenever NaN value is encountered.
+
+clapack source has already been run through f2c without -trapuv,
+so uninit.c code is not used anywhere and can be safely excluded.
+
+Signed-off-by: Alex Suykov <alex.suykov@gmail.com>
+
+--- a/F2CLIBS/libf2c/CMakeLists.txt
+++ b/F2CLIBS/libf2c/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ set(MISC 
+   f77vers.c i77vers.c main.c s_rnge.c abort_.c exit_.c getarg_.c iargc_.c
+   getenv_.c signal_.c s_stop.c s_paus.c system_.c cabs.c ctype.c
+-  derf_.c derfc_.c erf_.c erfc_.c sig_die.c uninit.c)
+  derf_.c derfc_.c erf_.c erfc_.c sig_die.c)
+ set(POW pow_ci.c pow_dd.c pow_di.c pow_hh.c pow_ii.c pow_ri.c pow_zi.c pow_zz.c)
+ set(CX 	c_abs.c c_cos.c c_div.c c_exp.c c_log.c c_sin.c c_sqrt.c)
+ set(DCX	z_abs.c z_cos.c z_div.c z_exp.c z_log.c z_sin.c z_sqrt.c)
@@ -0,0 +1,16 @@
+musl only provides off64_t, not __off64_t.
+glibc and uclibc have both defined.
+
+Signed-off-by: Alex Suykov <alex.suykov@gmail.com>
+
+--- a/F2CLIBS/libf2c/sysdep1.h
+++ b/F2CLIBS/libf2c/sysdep1.h
+@@ -10,7 +10,7 @@
+ 
+ #ifdef __linux__
+ #define USE_LARGEFILE
+-#define OFF_T __off64_t
+#define OFF_T off64_t
+ #endif
+ 
+ #ifdef _AIX43
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_CPIO
 	bool "cpio"
 	# Need argp.h support
-	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
+	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
 	depends on BR2_USE_WCHAR
 	help
 	  cpio archive utility for creation and extraction.
@@ -15,10 +15,9 @@ CPIO_PATCH = \
 	https://projects.archlinux.org/svntogit/packages.git/plain/cpio/trunk/cpio-2.11-check_for_symlinks-CVE-2015-1197.patch \
 	https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/cpio/files/cpio-2.11-stat.patch

-# cpio uses argp.h which is not provided by uclibc by default.
-# Use the argp-standalone package to provide this but make sure
-# the host package does not try to use the host version.
-ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
+# cpio uses argp.h which is not provided by uclibc or musl by default.
+# Use the argp-standalone package to provide this.
+ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
 CPIO_DEPENDENCIES += argp-standalone
 endif

@@ -1,2 +1,5 @@
+# From http://sourceforge.net/projects/cppcms/files/cppcms/1.0.5/
+sha1	15f21897c14acfd4b0c74622e49d95857f2fe939	cppcms-1.0.5.tar.bz2
+md5	d668c201dd31fff8090380ebdc0bcc2b	cppcms-1.0.5.tar.bz2
 # Locally computed:
-sha256  7c76befc706f3a5f7435b5757eab56784d762db9dd3654467e02e85000caf700  cppcms-1.0.4.tar.bz2
+sha256	84b685977bca97c3e997497f227bd5906adb80555066d811a7046b01c2f51865	cppcms-1.0.5.tar.bz2
@@ -4,7 +4,7 @@
 #
 ################################################################################

-CPPCMS_VERSION = 1.0.4
+CPPCMS_VERSION = 1.0.5
 CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2
 CPPCMS_LICENSE = LGPLv3
 CPPCMS_LICENSE_FILES = COPYING.TXT
@@ -0,0 +1,17 @@
+mkcramfs; loff_t is guarded by _GNU_SOURCE
+
+Although already properly done in cramfsck, it was missing in mkcramfs.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN cramfs-1.1.orig/mkcramfs.c cramfs-1.1/mkcramfs.c
+--- cramfs-1.1.orig/mkcramfs.c	2015-08-05 22:31:16.830543096 +0200
+++ cramfs-1.1/mkcramfs.c	2015-08-05 22:33:33.136289744 +0200
+@@ -22,6 +22,7 @@
+  * If you change the disk format of cramfs, please update fs/cramfs/README.
+  */
+ 
+#define _GNU_SOURCE
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <sys/stat.h>
@@ -0,0 +1,39 @@
+Use off_t instead of __off_t
+
+__off_t is an internal C library type, which shouldn't be used by
+applications. It is not defined by the musl C library, so use the
+public off_t type instead.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/ftpfs.c
+===================================================================
+--- a/ftpfs.c
+++ b/ftpfs.c
+@@ -687,7 +687,7 @@
+ 	return ftpfs_getattr(path, &sbuf);
+ }
+ 
+-static __off_t test_size(const char* path)
+static off_t test_size(const char* path)
+ {
+ 	struct stat sbuf;
+ 	int err = ftpfs_getattr(path, &sbuf);
+@@ -950,7 +950,7 @@
+ 
+   /* fix openoffice problem, truncating exactly to file length */
+   
+-  __off_t size = (long long int)test_size(path); 
+  off_t size = (long long int)test_size(path); 
+   DEBUG(1, "ftpfs_truncate: %s check filesize=%lld\n", path, (long long int)size);
+   
+   if (offset == size)  
+@@ -978,7 +978,7 @@
+   }
+   /* fix openoffice problem, truncating exactly to file length */
+   
+-  __off_t size = test_size(path); 
+  off_t size = test_size(path); 
+   DEBUG(1, "ftpfs_ftruncate: %s check filesize=%lld\n", path, (long long int)size);
+   
+   if (offset == size)  
@@ -1,206 +0,0 @@
-From 23591404610b1eeffb69712d93c77c2327b9ef7a Mon Sep 17 00:00:00 2001
-From: Phillip Mienk <mienkphi@gmail.com>
-Date: Fri, 31 Oct 2014 00:55:35 -0700
-Subject: [PATCH] Simply configure.ac to prevent contradictory discovery of
- libzmq.
-
-[Romain: rebase on top of 3.0.0]
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
- Makefile.am                   |  3 ++-
- addons/Makefile.am.supplement |  3 ++-
- configure.ac                  | 46 ++-----------------------------------------
- model/build-autoconf.gsl      | 28 ++++++++++++++++++++++++++
- model/project.xml             |  3 +++
- src/Makefile.am.supplement    | 12 ++++++++++-
- 6 files changed, 48 insertions(+), 47 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 10f21fb..187c62b 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,8 @@
- ACLOCAL_AMFLAGS = -I config
- 
- AM_CPPFLAGS = \
-    -I$(srcdir)/include
-+	${zmq_CFLAGS} \
-+	-I$(srcdir)/include
- 
- EXTRA_DIST = \
- 	version.sh \
-diff --git a/addons/Makefile.am.supplement b/addons/Makefile.am.supplement
-index 8800db4..74f0c60 100644
--- a/addons/Makefile.am.supplement
-+++ b/addons/Makefile.am.supplement
-@@ -4,7 +4,8 @@ EXTRA_DIST += \
- bin_PROGRAMS += makecert
- 
- makecert_LDADD = \
-    libczmq.la
-+    libczmq.la \
-+    ${zmq_LIBS}
- 
- makecert_SOURCES = \
-     addons/makecert.c
-diff --git a/configure.ac b/configure.ac
-index 1a4667e..1ccae06 100755
--- a/configure.ac
-+++ b/configure.ac
-@@ -74,50 +74,8 @@ if test "x${CZMQ_GCOV}" == "xyes"; then
-     fi
- fi
- 
-# Check for libzmq library
-libzmq_prefix=detect
-AC_ARG_WITH([libzmq], 
-    [AS_HELP_STRING([--with-libzmq=PREFIX], 
-        [build with ZeroMQ library installed in PREFIX [default=autodetect]])],
-    [case "x$withval" in
-        xno)
-            AC_MSG_ERROR([CZMQ requires the ZeroMQ library])
-            ;;
-        xyes|x)
-            ;;
-        *)
-            CPPFLAGS="$CPPFLAGS -I${withval}/include"
-            LDFLAGS="$LDFLAGS -L${withval}/lib"
-            zeromq_prefix=${withval}
-            ;;
-    esac ]
-)
-if test "x$libzmq_prefix" = "xdetect"; then
-    PKG_CHECK_MODULES(
-        [ZeroMQ], [libzmq], [libzmq_prefix=pkgconfig], [libzmq_prefix=])
-        if test "x$libzmq_prefix" = "xpkgconfig"; then
-            CPPFLAGS="$CPPFLAGS ${ZeroMQ_CFLAGS}"
-            LDFLAGS="$LDFLAGS ${ZeroMQ_LIBS}"
-        fi
-fi
-
-if test "x$czmq_search_libzmq" = "xyes"; then
-    if test -r "${with_libzmq}/include/zmq.h"; then
-        CFLAGS="-I${with_libzmq}/include ${CFLAGS}"
-        LDFLAGS="-L${with_libzmq}/lib ${LDFLAGS}"
-    fi
-fi
-
-AC_CHECK_HEADER([zmq.h], [], [AC_MSG_ERROR([cannot find zmq.h])])
-
-AC_CHECK_LIB(zmq, zmq_init, ,[AC_MSG_ERROR([cannot link with -lzmq, install libzmq.])])
-
-AC_MSG_CHECKING([whether libzmq installation works])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <zmq.h>],
-                                [zmq_init(1);])
-               ],
-               [AC_MSG_RESULT([yes])],
-               [AC_MSG_ERROR([no. Please specify libzmq installation prefix using --with-libzmq])])
-+# Check for libzmq
-+PKG_CHECK_MODULES([zmq], [libzmq])
- 
- # Platform specific checks
- czmq_on_mingw32="no"
-diff --git a/model/build-autoconf.gsl b/model/build-autoconf.gsl
-index d012a3c..30aff14 100644
--- a/model/build-autoconf.gsl
-+++ b/model/build-autoconf.gsl
-@@ -46,12 +46,39 @@ lib$(project.name)_la_SOURCES = \\
- 
- bin_PROGRAMS = $(project.name)_selftest
- 
-+$(project.name)_selftest_CPPFLAGS = \\
-+.for package_dependency where defined (package_dependency.for_test)
-+    \${$(package_dependency.name)_CFLAGS} \\
-+.endfor
-+    \${lib$(project.name)_la_CFLAGS}
-+
- $(project.name)_selftest_LDADD = \\
-+.if count (package_dependency, defined (count.for_lib) | defined (count.for_test) | defined (count.for_all)) > 0
-+    lib$(project.name).la \\
-+.else
-     lib$(project.name).la
-+.endif
-+.for package_dependency where defined (package_dependency.for_lib) | defined (package_dependency.for_test) | defined (package_dependency.for_all)
-+.   if last()
-+    \${$(package_dependency.name)_LIBS}
-+.   else
-+    \${$(package_dependency.name)_LIBS} \\
-+.endif
-+.endfor
- 
- $(project.name)_selftest_SOURCES = \\
-     src/$(project.name)_selftest.c
- 
-+lib$(project.name)_la_CPPFLAGS = \\
-+.for package_dependency where defined (package_dependency.for_lib)
-+.   if last()
-+    \${$(package_dependency.name)_CFLAGS}
-+.   else
-+    \${$(package_dependency.name)_CFLAGS} \\
-+.   endif
-+.endfor
-+    ${AM_CPPFLAGS}
-+
- lib$(project.name)_la_LDFLAGS = \\
-     -version-info @LTVER@
- 
-@@ -62,6 +89,7 @@ lib$(project.name)_la_LDFLAGS += \\
- endif
- 
- TESTS = $(project.name)_selftest
-+
- .for model
- .   if first ()
- 
-diff --git a/model/project.xml b/model/project.xml
-index 91306cf..b7bab4a 100644
--- a/model/project.xml
-+++ b/model/project.xml
-@@ -2,6 +2,9 @@
-     name = "czmq"
-     script = "project.gsl"
-     >
-+
-+    <package_dependency name="zmq" pkg_name="libzmq" for_all="1" />
-+
-     <header name = "czmq" />
-     <header name = "czmq_prelude" />
- 
-diff --git a/src/Makefile.am.supplement b/src/Makefile.am.supplement
-index 91e5b62..929aa07 100644
--- a/src/Makefile.am.supplement
-+++ b/src/Makefile.am.supplement
-@@ -95,12 +95,19 @@ libczmq_la_SOURCES = \
- 
- bin_PROGRAMS = czmq_selftest
- 
-+czmq_selftest_CPPFLAGS = \
-+    ${src_libczmq_la_CFLAGS}
-+
- czmq_selftest_LDADD = \
-    libczmq.la
-+    libczmq.la \
-+    ${zmq_LIBS}
- 
- czmq_selftest_SOURCES = \
-     src/czmq_selftest.c
- 
-+libczmq_la_CPPFLAGS = \
-+    ${AM_CPPFLAGS}
-+
- libczmq_la_LDFLAGS = \
-     -version-info @LTVER@
- 
-@@ -112,6 +119,9 @@ endif
- 
- TESTS = czmq_selftest
- 
-+# define custom target for all products of /src
-+src: src/libczmq.la src/czmq_selftest
-+
- # Produce generated models; do this manually in src directory
- code:
- 	gsl -q src/sockopts.xml
-- 
-1.9.3
-
@@ -4,7 +4,7 @@
 #
 ################################################################################

-CZMQ_VERSION = v3.0.0
+CZMQ_VERSION = v3.0.2
 CZMQ_SITE = $(call github,zeromq,czmq,$(CZMQ_VERSION))

 # Autoreconf required as we use the git tree
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_DAWGDIC
 	bool "dawgdic"
 	depends on BR2_INSTALL_LIBSTDCPP
+	# needs std::strtoll
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
 	help
 	  dawgdic provides a library for building and accessing
 	  dictionaries implemented with directed acyclic word graphs
@@ -13,5 +15,5 @@ config BR2_PACKAGE_DAWGDIC

 	  https://github.com/stil/dawgdic

-comment "dawgdic needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "dawgdic needs a toolchain w/ C++, gcc >= 4.6"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
@@ -16,7 +16,8 @@ DHCPDUMP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`
 endif

 define DHCPDUMP_BUILD_CMDS
-	$(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)" LIBS="$(DHCPDUMP_LIBS)"
+	$(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS) -D_GNU_SOURCE" \
+		LIBS="$(DHCPDUMP_LIBS)"
 endef

 define DHCPDUMP_INSTALL_TARGET_CMDS
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	9ed484b9879d63f7a0bc1010562f17d8aaadf4261e9a126299796cb9696d93ba	dnsmasq-2.74.tar.xz
+sha256	640c4e1d4c298e42458419cd78cfc26acc549401b1a34d271cd3e0e4226941f1	dnsmasq-2.75.tar.xz
@@ -4,7 +4,7 @@
 #
 ################################################################################

-DNSMASQ_VERSION = 2.74
+DNSMASQ_VERSION = 2.75
 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
@@ -0,0 +1,45 @@
+From 7a589ef6dab52ad32a296939f0ed2acb4d76b2a7 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Sun, 16 Aug 2015 15:55:43 +0200
+Subject: [PATCH] mkfs.fat: fix incorrect int type
+
+u_int32_t is not a stanard type, while uint32_t is. This fixes builds
+with the musl C library, which only defines so-called "clean" headers;
+build failures are like (back-quotes and elision manually added for
+readability):
+
+    http://autobuild.buildroot.org/results/a09/a0923d7f6d4dbae02eba4c5024bbdae3a52aa85a/build-end.log
+
+    /home/peko/autobuild/instance-1/output/host/usr/bin/x86_64-linux-gcc -D_LARGEFILE_SOURCE \
+        -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64   -Os  -D_GNU_SOURCE -D_LARGEFILE_SOURCE \
+        -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -c -o mkfs.fat.o src/mkfs.fat.c
+    src/mkfs.fat.c: In function 'main':
+    src/mkfs.fat.c:1415:18: error: 'u_int32_t' undeclared (first use in this function)
+         volume_id = (u_int32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec); [...]
+                      ^
+    src/mkfs.fat.c:1415:18: note: each undeclared identifier is reported only once for each
+    function it appears in
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+Upstream status: applied: https://github.com/dosfstools/dosfstools/pull/9
+---
+ src/mkfs.fat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c
+index b38d116..dddbe24 100644
+--- a/src/mkfs.fat.c
+++ b/src/mkfs.fat.c
+@@ -1412,7 +1412,7 @@ int main(int argc, char **argv)
+ 
+     gettimeofday(&create_timeval, NULL);
+     create_time = create_timeval.tv_sec;
+-    volume_id = (u_int32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec);	/* Default volume ID = creation time, fudged for more uniqueness */
+    volume_id = (uint32_t) ((create_timeval.tv_sec << 20) | create_timeval.tv_usec);	/* Default volume ID = creation time, fudged for more uniqueness */
+     check_atari();
+ 
+     printf("mkfs.fat " VERSION " (" VERSION_DATE ")\n");
+-- 
+1.9.1
+
@@ -9,24 +9,26 @@ test -r /etc/default/dropbear && . /etc/default/dropbear
 start() {
 	DROPBEAR_ARGS="$DROPBEAR_ARGS -R"

-	echo -n "Starting dropbear sshd: "
-	umask 077
-
 	# If /etc/dropbear is a symlink to /var/run/dropbear, and
 	#   - the filesystem is RO (i.e. we can not rm the symlink),
 	#     create the directory pointed to by the symlink.
 	#   - the filesystem is RW (i.e. we can rm the symlink),
 	#     replace the symlink with an actual directory
 	if [ -L /etc/dropbear \
-	     -a "$(readlink -f /etc/dropbear)" = "/var/run/dropbear" ]
+	     -a "$(readlink /etc/dropbear)" = "/var/run/dropbear" ]
 	then
-		if rm -f /etc/dropbear; then
+		if rm -f /etc/dropbear >/dev/null 2>&1; then
 			mkdir -p /etc/dropbear
 		else
-			mkdir -p $(readlink /etc/dropbear)
+			echo "No persistent location to store SSH host keys. New keys will be"
+			echo "generated at each boot. Are you sure this is what you want to do?"
+			mkdir -p "$(readlink /etc/dropbear)"
 		fi
 	fi

+	echo -n "Starting dropbear sshd: "
+	umask 077
+
 	start-stop-daemon -S -q -p /var/run/dropbear.pid \
 		--exec /usr/sbin/dropbear -- $DROPBEAR_ARGS
 	[ $? = 0 ] && echo "OK" || echo "FAIL"
@@ -93,7 +93,7 @@ define DROPBEAR_INSTALL_TARGET_CMDS
 	for f in $(DROPBEAR_TARGET_BINS); do \
 		ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/$$f ; \
 	done
-	ln -snf ../var/run/dropbear $(TARGET_DIR)/etc/dropbear
+	ln -snf /var/run/dropbear $(TARGET_DIR)/etc/dropbear
 endef

 $(eval $(autotools-package))
@@ -10,11 +10,13 @@ After=syslog.target network.target auditd.service
 #     replace the symlink with an actual directory
 ExecStartPre=/bin/sh -c '\
 if [ -L /etc/dropbear \
-     -a "$(readlink -f /etc/dropbear)" = "/var/run/dropbear" ]; then \
-    if rm -f /etc/dropbear; then \
+     -a "$(readlink /etc/dropbear)" = "/var/run/dropbear" ]; then \
+    if rm -f /etc/dropbear >/dev/null 2>&1; then \
        mkdir -p /etc/dropbear; \
    else \
-        mkdir -p $(readlink /etc/dropbear); \
+        echo "No persistent location to store SSH host keys. New keys will be"; \
+        echo "generated at each boot. Are you sure this is what you want to do?"; \
+        mkdir -p "$(readlink /etc/dropbear)"; \
    fi; \
 fi'
 ExecStart=/usr/sbin/dropbear -F -R
@@ -1,6 +1,7 @@
-comment "elfutils needs a toolchain w/ wchar, dynamic library"
+comment "elfutils needs a uClibc or (e)glibc toolchain w/ wchar, dynamic library"
 	depends on !BR2_bfin
-	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
+	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \
+		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)

 config BR2_PACKAGE_ELFUTILS
 	bool "elfutils"
@@ -8,6 +9,8 @@ config BR2_PACKAGE_ELFUTILS
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	depends on BR2_USE_WCHAR
 	depends on !BR2_STATIC_LIBS
+	# Only glibc and uClibc implement the myriad of required GNUisms
+	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC
 	# build issue caused by the _ prefix used on blackfin for
 	# assembly symbols
 	depends on !BR2_bfin
@@ -0,0 +1,49 @@
+empty uses SysV semaphores, so the ifdef is wrong here.
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+--- empty-0.6.19b.orig/empty.c	2012-09-19 13:24:05.000000000 +0200
+++ empty-0.6.19b/empty.c	2015-07-09 02:00:09.000000000 +0200
+@@ -179,25 +179,23 @@ int main (int argc, char *argv[]) {
+ 					   2 - unknown */
+ 	
+ /* semaphores */
+-#ifdef _POSIX_SEMAPHORES
+-	#if defined(__linux__) && defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
+-		/* union semun is defined by including <sys/sem.h> */
+-	#else
+-		union semun {
+-			int val;
+-			struct semid_ds *buf;
+-		#ifdef __SVR4
+-			ushort_t	*array;
+-		#endif
+-		#ifdef __hpux__
+-			ushort		*array;
+-		#endif
+-		#ifdef __linux__
+-			unsigned short *array;
+-			struct seminfo *__buf;		/* buffer for IPC_INFO */
+-		#endif
+-		};
+-  	#endif
+#if defined(__linux__) && defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
+	/* union semun is defined by including <sys/sem.h> */
+#else
+	union semun {
+		int val;
+		struct semid_ds *buf;
+	#ifdef __SVR4
+		ushort_t	*array;
+	#endif
+	#ifdef __hpux__
+		ushort		*array;
+	#endif
+	#ifdef __linux__
+		unsigned short *array;
+		struct seminfo *__buf;		/* buffer for IPC_INFO */
+	#endif
+	};
+ #endif
+ 	union semun semu;
+ 	
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ERLANG_P1_TLS
 	bool "erlang-p1-tls"
+	select BR2_PACKAGE_OPENSSL
 	help
 	  Erlang interface to OpenSSL

@@ -9,5 +9,6 @@ ERLANG_P1_TLS_SITE = $(call github,processone,tls,$(ERLANG_P1_TLS_VERSION))
 ERLANG_P1_TLS_LICENSE = GPLv2+
 ERLANG_P1_TLS_LICENSE_FILES = COPYING
 ERLANG_P1_TLS_INSTALL_STAGING = YES
+ERLANG_P1_TLS_DEPENDENCIES = openssl

 $(eval $(rebar-package))
@@ -0,0 +1,93 @@
+From 1205e0b50067c5ebfa082f149f0996304aa04335 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Thu, 30 Jul 2015 16:55:45 +0200
+Subject: [PATCH] build-sys: check for mallinfo
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+mallinfo is not specified by POSIX or the C standards, therefore
+it's not available for all libc libraries (musl).
+
+Add the ability to disable mallinfo statistics.
+
+Fixes:
+selinux-util.c: In function ‘mac_selinux_init’:
+selinux-util.c:70:25: error: storage size of ‘before_mallinfo’ isn’t known
+         struct mallinfo before_mallinfo, after_mallinfo;
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ configure.ac              |  3 +++
+ src/shared/selinux-util.c | 15 +++++++++++++++
+ 2 files changed, 18 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index ec23ab5..4a293b2 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -226,6 +226,9 @@ else
+ fi
+ AC_SUBST(sushell)
+ 
+# selinux-util.c uses struct mallinfo which is not available for all C libraries (musl).
+AC_CHECK_FUNCS([mallinfo])
+
+ # ------------------------------------------------------------------------------
+ 
+ AC_CHECK_DECL([unshare],
+diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
+index 756215e..4e0866b 100644
+--- a/src/shared/selinux-util.c
+++ b/src/shared/selinux-util.c
+@@ -67,7 +67,10 @@ int mac_selinux_init(const char *prefix) {
+ 
+ #ifdef HAVE_SELINUX
+         usec_t before_timestamp, after_timestamp;
+
+#ifdef HAVE_MALLINFO
+         struct mallinfo before_mallinfo, after_mallinfo;
+#endif
+ 
+         if (!mac_selinux_use())
+                 return 0;
+@@ -75,7 +78,10 @@ int mac_selinux_init(const char *prefix) {
+         if (label_hnd)
+                 return 0;
+ 
+#ifdef HAVE_MALLINFO
+         before_mallinfo = mallinfo();
+#endif
+
+         before_timestamp = now(CLOCK_MONOTONIC);
+ 
+         if (prefix) {
+@@ -92,9 +98,14 @@ int mac_selinux_init(const char *prefix) {
+                 r = security_getenforce() == 1 ? -errno : 0;
+         } else  {
+                 char timespan[FORMAT_TIMESPAN_MAX];
+
+#ifdef HAVE_MALLINFO
+                 int l;
+#endif
+ 
+                 after_timestamp = now(CLOCK_MONOTONIC);
+
+#ifdef HAVE_MALLINFO
+                 after_mallinfo = mallinfo();
+ 
+                 l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
+@@ -102,6 +113,10 @@ int mac_selinux_init(const char *prefix) {
+                 log_debug("Successfully loaded SELinux database in %s, size on heap is %iK.",
+                           format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0),
+                           (l+1023)/1024);
+#else
+                log_debug("Successfully loaded SELinux database in %s",
+                          format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0));
+#endif
+         }
+ #endif
+ 
+-- 
+2.4.3
+
@@ -0,0 +1,69 @@
+From 0b04a8347981ceb1030768c3002ac3c2bc0a0bf1 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@openwide.fr>
+Date: Thu, 30 Jul 2015 17:31:31 +0200
+Subject: [PATCH] build-sys: check for strndupa
+
+strndupa is a GNU extension, therefore it's not available
+for all libc libraries (musl).
+
+This patch is based on the one proposed by Emil Renner Berthing for
+systemd [1].
+
+[1] http://lists.freedesktop.org/archives/systemd-devel/2014-September/023190.html
+
+Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+---
+ configure.ac              |  3 ++-
+ src/shared/missing.h      | 11 +++++++++++
+ src/shared/selinux-util.c |  1 +
+ 3 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4a293b2..9c383c2 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -66,8 +66,9 @@ AC_C_INLINE
+ AC_TYPE_MODE_T
+ AC_TYPE_PID_T
+ AC_CHECK_MEMBERS([struct stat.st_rdev])
+-AC_CHECK_DECLS([getrandom, gettid, name_to_handle_at, accept4, mkostemp], [], [], [[#include <sys/types.h>
+AC_CHECK_DECLS([getrandom, gettid, name_to_handle_at, accept4, mkostemp, strndupa], [], [], [[#include <sys/types.h>
+ #include <unistd.h>
+#include <string.h>
+ #include <sys/mount.h>
+ #include <fcntl.h>
+ #include <sys/socket.h>
+diff --git a/src/shared/missing.h b/src/shared/missing.h
+index 2dc9d84..9031119 100644
+--- a/src/shared/missing.h
+++ b/src/shared/missing.h
+@@ -158,3 +158,14 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
+ #ifndef AT_EMPTY_PATH
+ #define AT_EMPTY_PATH 0x1000
+ #endif
+
+#if !HAVE_DECL_STRNDUPA
+#define strndupa(s, n) \
+  ({ \
+    const char *__old = (s); \
+    size_t __len = strnlen(__old, (n)); \
+    char *__new = (char *)alloca(__len + 1); \
+    __new[__len] = '\0'; \
+    (char *)memcpy(__new, __old, __len); \
+  })
+#endif
+diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
+index 4e0866b..a18a5a7 100644
+--- a/src/shared/selinux-util.c
+++ b/src/shared/selinux-util.c
+@@ -31,6 +31,7 @@
+ #include "strv.h"
+ #include "path-util.h"
+ #include "selinux-util.h"
+#include "missing.h"
+ 
+ #ifdef HAVE_SELINUX
+ DEFINE_TRIVIAL_CLEANUP_FUNC(security_context_t, freecon);
+-- 
+2.4.3
+
@@ -11,6 +11,11 @@ EUDEV_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
 EUDEV_LICENSE_FILES = COPYING
 EUDEV_INSTALL_STAGING = YES

+# configure.ac is patched by:
+# 0002-build-sys-check-for-mallinfo.patch
+# 0003-build-sys-check-for-strndupa.patch
+EUDEV_AUTORECONF = YES
+
 # mq_getattr is in librt
 EUDEV_CONF_ENV += LIBS=-lrt

@@ -10,15 +10,24 @@ EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz
 EXFAT_DEPENDENCIES = host-scons libfuse
 EXFAT_LICENSE = GPLv3+
 EXFAT_LICENSE_FILES = COPYING
+EXFAT_CFLAGS = $(TARGET_CFLAGS) -std=c99
+
+# The endianness handling functions in platform.h are protected behind
+# ifdef __GLIBC__ which musl doesn't define even though it does
+# provide the endianness handling interface. Work around it by
+# ensuring __GLIBC__ is defined.
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
+EXFAT_CFLAGS += -D__GLIBC__
+endif

 define EXFAT_BUILD_CMDS
 	(cd $(@D); \
-		$(TARGET_CONFIGURE_OPTS) CCFLAGS="$(TARGET_CFLAGS) -std=c99" $(SCONS))
+		$(TARGET_CONFIGURE_OPTS) CCFLAGS="$(EXFAT_CFLAGS)" $(SCONS))
 endef

 define EXFAT_INSTALL_TARGET_CMDS
 	(cd $(@D); \
-		$(TARGET_CONFIGURE_OPTS) CCFLAGS="$(TARGET_CFLAGS) -std=c99" $(SCONS) \
+		$(TARGET_CONFIGURE_OPTS) CCFLAGS="$(EXFAT_CFLAGS)" $(SCONS) \
 		DESTDIR=$(TARGET_DIR)/usr/sbin install)
 endef

@@ -1,9 +1,6 @@
 config BR2_PACKAGE_FAN_CTRL
 	bool "fan-ctrl"
 	depends on BR2_USE_MMU # fork()
-	# SourceForge is down, not backup location, let's disable for
-	# now.
-	depends on BR2_BROKEN
 	help
 	  Fan-ctrl is a little daemon that controls the speed of one
 	  or more system or CPU fans. It does so by monitoring
@@ -4,7 +4,7 @@
 #
 ################################################################################

-FILEMQ_VERSION = 482797b8aa30fcc9ea1377aabdf2b0769f9f698e
+FILEMQ_VERSION = acf6c0e003fee938994ad803aa7b78245dca57ba
 FILEMQ_SITE = $(call github,zeromq,filemq,$(FILEMQ_VERSION))

 FILEMQ_AUTORECONF = YES
@@ -0,0 +1,12 @@
+Upstream status: In progress
+
+--- a/libgcc/config/nios2/linux-atomic.c
+++ b/libgcc/config/nios2/linux-atomic.c
+@@ -20,7 +20,6 @@
+ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ <http://www.gnu.org/licenses/>.  */
+ 
+-#include <asm/unistd.h>
+ #define EFAULT  14
+ #define EBUSY   16
+ #define ENOSYS  38
@@ -0,0 +1,19 @@
+To avoid :
+error: 'mode_t' has not been declared
+sys/types.h must be included 
+
+Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
+---
+Index: gnuradio-3.7.5/gnuradio-runtime/include/gnuradio/logger.h.in
+===================================================================
+--- gnuradio-3.7.5.orig/gnuradio-runtime/include/gnuradio/logger.h.in
+++ gnuradio-3.7.5/gnuradio-runtime/include/gnuradio/logger.h.in
+@@ -44,6 +44,8 @@
+ 
+ #ifdef _MSC_VER
+ typedef unsigned short mode_t;
+#else
+#include <sys/types.h>
+ #endif
+ 
+ #include <gnuradio/api.h>
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	80a471c723572a43ddbe75d7825a3275f640650cc99eae42963ab39b9d0b7552	gnutls-3.3.16.tar.xz
+sha256	b40f158030a92f450a07b20300a3996710ca19800848d9f6fd62493170c5bbb4	gnutls-3.3.17.1.tar.xz
@@ -5,7 +5,7 @@
 ################################################################################

 GNUTLS_VERSION_MAJOR = 3.3
-GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).16
+GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).17.1
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
 GNUTLS_LICENSE = GPLv3+ LGPLv2.1+
@@ -557,14 +557,24 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON

 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV
 	bool "opencv"
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
-	depends on BROKEN # gst1-plugin-opencv does not (yet) support opencv >=3.x
+	depends on BR2_PACKAGE_OPENCV
+	# Remove the following opencv modules when gstreamer fixes the
+	# problem of including the old "cv.h" header
+	# bug: https://bugzilla.gnome.org/show_bug.cgi?id=725163
+	select BR2_PACKAGE_OPENCV_LIB_CALIB3D
+	select BR2_PACKAGE_OPENCV_LIB_CONTRIB
+	select BR2_PACKAGE_OPENCV_LIB_FEATURES2D
+	select BR2_PACKAGE_OPENCV_LIB_FLANN
+	select BR2_PACKAGE_OPENCV_LIB_IMGPROC
+	select BR2_PACKAGE_OPENCV_LIB_LEGACY
+	select BR2_PACKAGE_OPENCV_LIB_ML
+	select BR2_PACKAGE_OPENCV_LIB_OBJDETECT
+	select BR2_PACKAGE_OPENCV_LIB_VIDEO
 	help
 	  GStreamer OpenCV Plugins

-comment "opencv plugin needs a toolchain w/ C++, NPTL"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL
+comment "opencv plugin needs OpenCV-2.4"
+	depends on !BR2_PACKAGE_OPENCV

 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS
 	bool "opus"
@@ -28,6 +28,10 @@ GUILE_CFLAGS = \
 	-DHAVE_GC_GET_FREE_SPACE_DIVISOR \
 	-DHAVE_GC_SET_FINALIZE_ON_DEMAND

+ifeq ($(BR2_STATIC_LIBS),y)
+GUILE_CFLAGS += -DGC_NO_DLOPEN
+endif
+
 GUILE_CONF_ENV += GUILE_FOR_BUILD=$(HOST_DIR)/usr/bin/guile \
 	CFLAGS="$(TARGET_CFLAGS) $(GUILE_CFLAGS)"

@@ -9,6 +9,10 @@ HAVEGED_SITE = http://www.issihosts.com/haveged
 HAVEGED_LICENSE = GPLv3+
 HAVEGED_LICENSE_FILES = COPYING

+ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y)
+HAVEGED_CONF_OPTS += --enable-clock_gettime=yes
+endif
+
 define HAVEGED_INSTALL_INIT_SYSV
 	$(INSTALL) -m 755 -D package/haveged/S21haveged \
 		$(TARGET_DIR)/etc/init.d/S21haveged
@@ -0,0 +1,31 @@
+From bdfa1169c549122a8dc848b84469458101adeb20 Mon Sep 17 00:00:00 2001
+From: Brendan Heading <brendanheading@gmail.com>
+Date: Mon, 3 Aug 2015 12:44:55 +0100
+Subject: [PATCH 1/1] fix compilation issues with musl
+
+Using time_t strictly requires time.h to be included.
+
+NOTE I've stuck to the convention on this project where most of the
+files appear to pick up most of their headers by including "common.h".
+
+Upstream-status: pending
+Signed-off-by: Brendan Heading <brendanheading@gmail.com>
+---
+ src/lib/common.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/common.h b/src/lib/common.h
+index 798965f..9053826 100644
+--- a/src/lib/common.h
+++ b/src/lib/common.h
+@@ -9,6 +9,7 @@
+ #include <config.h>
+ #include <string.h>
+ #include <math.h>
+#include <time.h>
+ #ifdef WITH_DMALLOC
+ #include <dmalloc.h>
+ #endif
+-- 
+2.4.3
+
@@ -0,0 +1,50 @@
+Remove __P macro usage to fix musl build
+
+__P() is used for compatibility with old K&R C compilers. With ANSI C
+this macro has no effect.
+
+This fixes a compilation error with musl libc because of undeclared
+__P.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/md5.c
+===================================================================
+--- a/md5.c
+++ b/md5.c
+@@ -97,21 +97,21 @@
+ 
+ /* Initialize structure containing state of computation.
+    (RFC 1321, 3.3: Step 3)  */
+-static void md5_init_ctx __P ((struct md5_ctx *ctx));
+static void md5_init_ctx (struct md5_ctx *ctx);
+ 
+ /* Starting with the result of former calls of this function (or the
+    initialization function update the context for the next LEN bytes
+    starting at BUFFER.
+    It is necessary that LEN is a multiple of 64!!! */
+-static void md5_process_block __P ((const void *buffer, size_t len,
+-				    struct md5_ctx *ctx));
+static void md5_process_block (const void *buffer, size_t len,
+				    struct md5_ctx *ctx);
+ 
+ /* Starting with the result of former calls of this function (or the
+    initialization function update the context for the next LEN bytes
+    starting at BUFFER.
+    It is NOT required that LEN is a multiple of 64.  */
+-static void md5_process_bytes __P ((const void *buffer, size_t len,
+-				    struct md5_ctx *ctx));
+static void md5_process_bytes (const void *buffer, size_t len,
+				    struct md5_ctx *ctx);
+ 
+ /* Process the remaining bytes in the buffer and put result from CTX
+    in first 16 bytes following RESBUF.  The result is always in little
+@@ -120,7 +120,7 @@
+ 
+    IMPORTANT: On some systems it is required that RESBUF is correctly
+    aligned for a 32 bits value.  */
+-static void *md5_finish_ctx __P ((struct md5_ctx *ctx, void *resbuf));
+static void *md5_finish_ctx (struct md5_ctx *ctx, void *resbuf);
+ 
+ //----------------------------------------------------------------------------
+ //--------end of md5.h
@@ -3,6 +3,7 @@ config BR2_PACKAGE_KEXEC_LITE
 	depends on BR2_powerpc || BR2_powerpc64
 	depends on !BR2_STATIC_LIBS # dtc, elfutils
 	depends on BR2_USE_WCHAR # elfutils
+	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
 	select BR2_PACKAGE_ELFUTILS
 	select BR2_PACKAGE_DTC
 	select BR2_PACKAGE_DTC_PROGRAMS
@@ -13,6 +14,7 @@ config BR2_PACKAGE_KEXEC_LITE
 	  This package is a tiny implementation of the kexec userspace
 	  components, for devicetree-based platforms.

-comment "kexec-lite needs a toolchain w/ wchar, dynamic library"
+comment "kexec-lite needs a uClibc or (e)glibc toolchain w/ wchar, dynamic library"
 	depends on BR2_powerpc || BR2_powerpc64
-	depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR
+	depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR \
+		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
@@ -158,13 +158,15 @@ config BR2_PACKAGE_KODI_LIBCEC
 	bool "hdmi cec"
 	depends on !BR2_STATIC_LIBS # libcec
 	depends on BR2_PACKAGE_HAS_UDEV
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # libcec
 	select BR2_PACKAGE_LIBCEC
 	help
 	  Enable CEC (Consumer Electronics Control) support.
 	  Select this if you want Kodi to support HDMI CEC.

 comment "hdmi cec support needs udev /dev management and a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS || !BR2_PACKAGE_HAS_UDEV
+	depends on BR2_STATIC_LIBS || !BR2_PACKAGE_HAS_UDEV || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7

 config BR2_PACKAGE_KODI_LIRC
 	bool "lirc"
@@ -4,6 +4,7 @@ config BR2_PACKAGE_LIBCEC
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR
 	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
 	select BR2_PACKAGE_LIBPLATFORM
 	help
 	  libcec allows you in combination with the right hardware to
@@ -12,6 +13,7 @@ config BR2_PACKAGE_LIBCEC

 	  http://libcec.pulse-eight.com

-comment "libcec needs a toolchain w/ C++, wchar, threads, dynamic library"
+comment "libcec needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.7"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_USE_WCHAR || BR2_STATIC_LIBS
+		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
+		BR2_STATIC_LIBS
@@ -0,0 +1,29 @@
+Fix SPARCv8 condition
+
+The define provided by the compiler on SPARCv8 is __sparc_v8__ and not
+__sparcv8. From a SPARCv8 gcc:
+
+$ sparc-linux-gcc --version
+sparc-linux-gcc (Buildroot 2015.08-git-00497-ge110081) 4.9.3
+[...]
+$ sparc-linux-gcc -dM -E - < /dev/null | grep sparc
+#define sparc 1
+#define __sparc__ 1
+#define __sparc 1
+#define __sparc_v8__ 1
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/ev.c
+===================================================================
+--- a/ev.c
+++ b/ev.c
+@@ -649,7 +649,7 @@
+       #define ECB_MEMORY_FENCE         __asm__ __volatile__ ("dmb"      : : : "memory")
+     #elif __aarch64__
+       #define ECB_MEMORY_FENCE         __asm__ __volatile__ ("dmb ish"  : : : "memory")
+-    #elif (__sparc || __sparc__) && !__sparcv8
+    #elif (__sparc || __sparc__) && !__sparc_v8__
+       #define ECB_MEMORY_FENCE         __asm__ __volatile__ ("membar #LoadStore | #LoadLoad | #StoreStore | #StoreLoad" : : : "memory")
+       #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad"                            : : : "memory")
+       #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore             | #StoreStore")
@@ -22,7 +22,7 @@ LIBGPGME_CONF_OPTS = --with-gpg=/usr/bin/gpg \
 	--disable-gpg-test

 # Handle argp-standalone or it errors out during build
-ifeq ($(BR2_PACKAGE_ARGP_STANDALONE)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
+ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
 LIBGPGME_CONF_ENV += LIBS="-largp"
 LIBGPGME_DEPENDENCIES += argp-standalone
 endif
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_LIBGUDEV
+	bool "libgudev"
+	depends on BR2_INIT_SYSTEMD
+	depends on BR2_USE_WCHAR # gettext
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBGLIB2
+	help
+	  This library provides GObject bindings for libudev.  It was
+	  originally part of udev-extras, then udev, then systemd.
+	  It's now a project on its own. Required for building some
+	  programs that use udev, when using systemd.
+
+	  When systemd is not used, libgudev is directly provided by
+	  eudev.
+
+	  https://wiki.gnome.org/Projects/libgudev
+
+comment "libgudev needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
+	depends on BR2_INIT_SYSTEMD
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libgudev
+#
+################################################################################
+
+LIBGUDEV_VERSION = 230
+LIBGUDEV_SOURCE = libgudev-$(LIBGUDEV_VERSION).tar.xz
+LIBGUDEV_SITE = http://ftp.gnome.org/pub/GNOME/sources/libgudev/$(LIBGUDEV_VERSION)
+LIBGUDEV_INSTALL_STAGING = YES
+LIBGUDEV_DEPENDENCIES = host-pkgconf udev libglib2
+LIBGUDEV_LICENSE = LGPLv2.1+
+LIBGUDEV_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))
@@ -37,9 +37,13 @@ config BR2_PACKAGE_LIBIIO_TESTS
 	bool "Install test programs"
 	select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
 	select BR2_PACKAGE_LIBIIO_NETWORK_BACKEND
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Install the test programs (iio_info, iio_genxml, iio_readdev).

+comment "IIO test programs need a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
 config BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP
 	bool "Install C# bindings"
 	depends on BR2_PACKAGE_MONO
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LIBMBIM
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_PACKAGE_HAS_UDEV
+	select BR2_PACKAGE_LIBGUDEV if BR2_INIT_SYSTEMD
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  libmbim is a glib-based library for talking to WWAN modems and
@@ -13,6 +13,10 @@ LIBMBIM_INSTALL_STAGING = YES

 LIBMBIM_DEPENDENCIES = libglib2 udev

+ifeq ($(BR2_INIT_SYSTEMD),y)
+LIBMBIM_DEPENDENCIES += libgudev
+endif
+
 # we don't want -Werror
 LIBMBIM_CONF_OPTS = --enable-more-warnings=no

@@ -0,0 +1,45 @@
+From 5348da83403383a60831f4c297841afb98692887 Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sat, 16 May 2015 14:45:46 +0200
+Subject: [PATCH] extra: Define _GNU_SOURCE to get members of tcphdr&ucphdr
+
+The source uses linux names for members of tcphdr. For example
+"source" instead of "th_sport", ... musl libc's headers need
+_GNU_SOURCE defined in order to expose these.
+
+Signed-off-by: Felix Janda <felix.janda@posteo.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+[yann.morin.1998@free.fr: backported from upstream]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ src/extra/tcp.c | 1 +
+ src/extra/udp.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/extra/tcp.c b/src/extra/tcp.c
+index bf161aa..d1cd79d 100644
+--- a/src/extra/tcp.c
+++ b/src/extra/tcp.c
+@@ -15,6 +15,7 @@
+ #include <arpa/inet.h>
+ #include <netinet/ip.h>
+ #include <netinet/ip6.h>
+#define _GNU_SOURCE
+ #include <netinet/tcp.h>
+ 
+ #include <libnetfilter_queue/libnetfilter_queue.h>
+diff --git a/src/extra/udp.c b/src/extra/udp.c
+index 6e6baed..8c44a66 100644
+--- a/src/extra/udp.c
+++ b/src/extra/udp.c
+@@ -14,6 +14,7 @@
+ #include <arpa/inet.h>
+ #include <netinet/ip.h>
+ #include <netinet/ip6.h>
+#define _GNU_SOURCE
+ #include <netinet/udp.h>
+ 
+ #include <libnetfilter_queue/libnetfilter_queue.h>
+-- 
+1.9.1
+
@@ -0,0 +1,32 @@
+Include <sys/types.h> to get the u_int* definitions
+
+This is needed to fix the build with the musl C library, and this
+patch comes from
+http://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch.
+
+It will no longer be needed with upcoming upstream releases of
+libnfnetlink, since they have switched to use the <stdint.h> types
+instead. However this change was too invasive to backport.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+--- libnfnetlink-1.0.1.orig/include/libnfnetlink/linux_nfnetlink.h
+++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink.h
+@@ -1,6 +1,6 @@
+ #ifndef _NFNETLINK_H
+ #define _NFNETLINK_H
+-#include <linux/types.h>
+#include <sys/types.h>
+ #include <libnfnetlink/linux_nfnetlink_compat.h>
+ 
+ enum nfnetlink_groups {
+--- libnfnetlink-1.0.1.orig/include/libnfnetlink/libnfnetlink.h
+++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h
+@@ -15,6 +15,7 @@
+ #define aligned_u64 unsigned long long __attribute__((aligned(8)))
+ #endif
+ 
+#include <sys/types.h>
+ #include <sys/socket.h>	/* for sa_family_t */
+ #include <linux/netlink.h>
+ #include <libnfnetlink/linux_nfnetlink.h>
@@ -11,7 +11,10 @@ LIBPFM4_LICENSE = libpfm4 license
 LIBPFM4_LICENSE_FILES = COPYING
 LIBPFM4_INSTALL_STAGING = YES

-LIBPFM4_FLAGS = SYS=Linux ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" LDCONFIG=true
+LIBPFM4_FLAGS = SYS=Linux ARCH=$(BR2_ARCH) \
+	CC="$(TARGET_CC)" LDCONFIG=true \
+	CONFIG_PFMLIB_SHARED=$(if $(BR2_STATIC_LIBS),n,y) \
+	DBG=

 define LIBPFM4_BUILD_CMDS
 	$(MAKE) -C $(@D) $(LIBPFM4_FLAGS)
@@ -13,6 +13,20 @@ LIBPTHSEM_AUTORECONF = YES
 LIBPTHSEM_INSTALL_STAGING = YES
 LIBPTHSEM_CONFIG_SCRIPTS = pthsem-config

+# Force the setjmp/longjmp detection, because the test being done in
+# the AC_CHECK_SJLJ macro is not cross-compilation safe: it checks the
+# running kernel with 'uname -r', and checks the C library version by
+# looking at /usr/include/features.h. In terms of kernel version, it
+# assumes any version later than 2.2.x is fine, except that it doesn't
+# recognize 4.x as a valid kernel version, recognizing such systems as
+# "braindead" and therefore falling back to the 'sjljlx' value for
+# ac_cv_check_sjlj. In terms of C library version, it wants
+# __GLIBC_MINOR to be at least 1. Since both conditions are true for
+# all Buildroot systems, we can simply force the setjmp/longjmp
+# detection to ssjlj.
+LIBPTHSEM_CONF_ENV += \
+	ac_cv_check_sjlj=ssjlj
+
 ifeq ($(BR2_PACKAGE_LIBPTHSEM_COMPAT),y)
 LIBPTHSEM_CONF_OPTS += --enable-compat
 LIBPTHSEM_CONFIG_SCRIPTS += pth-config
@@ -10,4 +10,5 @@ config BR2_PACKAGE_LIBRTAS
 	  http://librtas.sourceforge.net/

 comment "librtas needs an (e)glibc toolchain"
+	depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
 	depends on !BR2_TOOLCHAIN_USES_GLIBC
@@ -4,6 +4,8 @@ config BR2_PACKAGE_LIBSELINUX
 	select BR2_PACKAGE_PCRE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
+	# Toolchain issue: "fixup not contained within frag"
+	depends on !BR2_arc
 	help
 	  libselinux is the runtime SELinux library that provides
 	  interfaces (e.g. library functions for the SELinux kernel
@@ -16,4 +18,5 @@ config BR2_PACKAGE_LIBSELINUX
 	  http://selinuxproject.org/page/Main_Page

 comment "libselinux needs a toolchain w/ threads, dynamic library"
+	depends on !BR2_arc
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
@@ -5,6 +5,7 @@ config BR2_PACKAGE_LIBSEMANAGE
 	select BR2_PACKAGE_BZIP2
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
+	depends on !BR2_arc
 	help
 	  libsemanage is the policy management library. It uses
 	  libsepol for binary policy manipulation and libselinux for
@@ -17,4 +18,5 @@ config BR2_PACKAGE_LIBSEMANAGE
 	  http://selinuxproject.org/page/Main_Page

 comment "libsemanage needs a toolchain w/ threads, dynamic library"
+	depends on !BR2_arc
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
@@ -3,12 +3,12 @@ config BR2_PACKAGE_LIBSIGSEGV
 	depends on !BR2_xtensa
 	depends on !BR2_arc # no ucontext_i.sym file
 	depends on !BR2_microblaze
-	# No ucontext support in uclibc for powerpc
-	depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC)
+	# No ucontext support in uclibc for powerpc and superh
+	depends on !((BR2_powerpc || BR2_sh) && BR2_TOOLCHAIN_USES_UCLIBC)
 	help
 	  Library for handling page faults in user mode.

 	  http://libsigsegv.sourceforge.net/

 comment "libsigsegv needs an (e)glibc toolchain"
-	depends on BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC
+	depends on (BR2_powerpc || BR2_sh) && BR2_TOOLCHAIN_USES_UCLIBC
@@ -10,4 +10,8 @@ LIBSODIUM_LICENSE = ISC
 LIBSODIUM_LICENSE_FILES = LICENSE
 LIBSODIUM_INSTALL_STAGING = YES

+ifeq ($(BR2_arc),y)
+LIBSODIUM_CONF_OPTS += --disable-pie
+endif
+
 $(eval $(autotools-package))
@@ -5,14 +5,16 @@ config BR2_PACKAGE_LIBV4L
 	depends on !BR2_STATIC_LIBS # dlopen()
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # media headers
-	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
+	# wait for libv4l 1.7+ for musl compatibility
+	depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC
+	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  libv4l is a collection of libraries which adds a thin abstraction
 	  layer on top of video4linux2 devices. libv4l consists of 3 different
 	  libraries: libv4lconvert, libv4l1 and libv4l2.

-	  http://freshmeat.net/projects/libv4l
+	  http://linuxtv.org/wiki/index.php/V4l-utils

 if BR2_PACKAGE_LIBV4L

@@ -29,7 +31,8 @@ config BR2_PACKAGE_LIBV4L_UTILS

 endif

-comment "libv4l needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0"
+comment "libv4l needs an uClibc or (e)glibc toolchain w/ threads, dynamic library, C++ and headers >= 3.0"
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
-		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 \
+		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
@@ -0,0 +1,66 @@
+utf: do not define decode() to be inline
+
+Currently, decode() is prototyped in utf.h, its body is in utf.c and it
+is called from util.c.
+
+However, decode() is defined to be inline, which can not work since,
+when compiling util.c, the body of decode() is out-of-scope for that
+compilation unit.
+
+Furthermore, decode() uses a utf8d, which is a static defined in utf.c .
+So utf8d is not visible when compiling util.c either.
+
+This means that the definition of decode() along with utf8d is basically
+wrong, and is now failing with gcc-5.x, with warnings like so:
+
+    libtool: compile:  /home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gcc -DHAVE_CONFIG_H -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wmissing-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -c utf.c  -fPIC -DPIC -o .libs/libwebsock_la-utf.o
+    utf.c:36:12: warning: ‘utf8d’ is static but used in inline function ‘decode’ which is not static
+       *state = utf8d[256 + *state*16 + type];
+                ^
+    utf.c:30:19: warning: ‘utf8d’ is static but used in inline function ‘decode’ which is not static
+       uint32_t type = utf8d[byte];
+                       ^
+    libtool: compile:  /home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gcc -DHAVE_CONFIG_H -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wmissing-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -c util.c  -fPIC -DPIC -o .libs/libwebsock_la-util.o
+    In file included from websock.h:73:0,
+                     from util.c:20:
+    utf.h:25:17: warning: inline function ‘decode’ declared but never defined
+     uint32_t inline decode(uint32_t *state, uint32_t *codep, uint32_t byte);
+                     ^
+
+This results in decode() to be omitted from libwebsock.so, and thus link
+failures when another program wants to link with -lwebsock.
+
+The simplest solution is to not inline decode() at all.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Note: an alternative would be to move both decode() and utf8d into
+decode.h nad ditch decode.c if decode really must be inline. This is
+left as an execise for an interested party. But since upstream hasn't
+seen a single commit in more than a year now... :-(
+
+diff -durN a/src/utf.c b/src/utf.c
+--- a/src/utf.c	2014-07-15 01:43:20.000000000 +0200
+++ b/src/utf.c	2015-08-22 22:29:38.667393786 +0200
+@@ -24,7 +24,7 @@
+   1,3,1,1,1,1,1,3,1,3,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // s7..s8
+ };
+ 
+-uint32_t inline
+uint32_t
+ decode(uint32_t* state, uint32_t* codep, uint32_t byte)
+ {
+   uint32_t type = utf8d[byte];
+diff -durN a/src/utf.h b/src/utf.h
+--- a/src/utf.h	2014-07-15 01:43:20.000000000 +0200
+++ b/src/utf.h	2015-08-22 22:29:10.439227396 +0200
+@@ -22,7 +22,7 @@
+ 
+ #include <stdint.h>
+ 
+-uint32_t inline decode(uint32_t *state, uint32_t *codep, uint32_t byte);
+uint32_t decode(uint32_t *state, uint32_t *codep, uint32_t byte);
+ 
+ 
+ #endif /* UTF_H_ */
@@ -1,7 +1,13 @@
+comment "lightning needs a toolchain w/ dynamic library"
+	depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \
+		BR2_mipsel || BR2_arm || BR2_powerpc
+	depends on BR2_STATIC_LIBS
+
 config BR2_PACKAGE_LIGHTNING
 	bool "lightning"
 	depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \
 		BR2_mipsel || BR2_arm || BR2_powerpc
+	depends on !BR2_STATIC_LIBS
 	help
 	  GNU lightning is a library that generates
 	  assembly language code at run-time.
@@ -10,11 +10,12 @@ config BR2_PACKAGE_LINUX_PAM
 	# https://lists.fedorahosted.org/pipermail/linux-pam-commits/2012-February/000105.html
 	# for details.
 	depends on !BR2_STATIC_LIBS
+	depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
 	help
 	  A Security Framework that Provides Authentication for Applications

 	  http://linux-pam.org

-comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library"
+comment "linux-pam needs a uClibc or (e)glibc toolchain w/ wchar, locale, dynamic library"
 	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
-		|| BR2_STATIC_LIBS
+		|| BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
@@ -2,6 +2,8 @@ config BR2_PACKAGE_LIRC_TOOLS
 	bool "lirc-tools"
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	# dlopen()
+	depends on !BR2_STATIC_LIBS
 	help
 	  LIRC is a package that supports receiving and sending IR
 	  signals of the most common IR remote controls. It contains a
@@ -15,6 +17,6 @@ config BR2_PACKAGE_LIRC_TOOLS

 	  http://www.lirc.org/

-comment "lirc-tools needs a toolchain w/ threads"
+comment "lirc-tools needs a toolchain w/ threads, dynamic library"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
@@ -0,0 +1,100 @@
+From 6d85773537c9f277ed342f57500f784ccb2c4a3e Mon Sep 17 00:00:00 2001
+From: Brendan Heading <brendanheading@gmail.com>
+Date: Sun, 30 Aug 2015 22:26:39 +0100
+Subject: [PATCH 1/1] fix compilation under musl
+
+This patch removes conditional compilation elements that are designed to
+support glibc versions earlier than 2.0, which were causing the build
+to fail under musl.
+
+Based on the patch found here :
+
+http://git.alpinelinux.org/cgit/aports/plain/main/lm_sensors/musl-fix-includes.patch?id=fece1d19448dbd3a56fd8ac70443116187141848
+
+This patch has been accepted for integration upstream and should be
+present in the next release. See :
+
+http://www.lm-sensors.org/changeset/6314
+
+Signed-off-by: Brendan Heading <brendanheading@gmail.com>
+Upstream-Status: pending
+---
+ prog/dump/isadump.c | 6 ------
+ prog/dump/isaset.c  | 6 ------
+ prog/dump/superio.c | 5 -----
+ prog/dump/util.c    | 5 -----
+ 4 files changed, 22 deletions(-)
+
+diff --git a/prog/dump/isadump.c b/prog/dump/isadump.c
+index e031e47..88e4c3b 100644
+--- a/prog/dump/isadump.c
+++ b/prog/dump/isadump.c
+@@ -36,13 +36,7 @@
+ #include "util.h"
+ #include "superio.h"
+ 
+-
+-/* To keep glibc2 happy */
+-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
+ #include <sys/io.h>
+-#else
+-#include <asm/io.h>
+-#endif
+ 
+ #ifdef __powerpc__
+ unsigned long isa_io_base = 0; /* XXX for now */
+diff --git a/prog/dump/isaset.c b/prog/dump/isaset.c
+index 1d1bdad..a084c8a 100644
+--- a/prog/dump/isaset.c
+++ b/prog/dump/isaset.c
+@@ -32,13 +32,7 @@
+ #include <string.h>
+ #include "util.h"
+ 
+-
+-/* To keep glibc2 happy */
+-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
+ #include <sys/io.h>
+-#else
+-#include <asm/io.h>
+-#endif
+ 
+ #ifdef __powerpc__
+ unsigned long isa_io_base = 0; /* XXX for now */
+diff --git a/prog/dump/superio.c b/prog/dump/superio.c
+index 1af7358..31e0d78 100644
+--- a/prog/dump/superio.c
+++ b/prog/dump/superio.c
+@@ -20,12 +20,7 @@
+ */
+ 
+ #include <stdlib.h>
+-
+-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
+ #include <sys/io.h>
+-#else
+-#include <asm/io.h>
+-#endif
+ 
+ #include "superio.h"
+ 
+diff --git a/prog/dump/util.c b/prog/dump/util.c
+index 676c339..d8b0927 100644
+--- a/prog/dump/util.c
+++ b/prog/dump/util.c
+@@ -11,12 +11,7 @@
+ #include <stdio.h>
+ #include "util.h"
+ 
+-/* To keep glibc2 happy */
+-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0
+ #include <sys/io.h>
+-#else
+-#include <asm/io.h>
+-#endif
+ 
+ /* Return 1 if we should continue, 0 if we should abort */
+ int user_ack(int def)
+-- 
+2.4.3
+
@@ -1,6 +1,16 @@
 config BR2_PACKAGE_LRZSZ
 	bool "lrzsz"
+	# It could technically build in a static-only environment, but
+	# it unconditionally redefines the error() and error_at_line()
+	# functions, which clashes with the definition from
+	# uClibc. Since the autotools packaging dates back from 1998,
+	# lots of work is needed to fix it, and do some proper tests
+	# on the availability of such functions.
+	depends on !BR2_STATIC_LIBS
 	help
 	  Portable and fast implementation of the X/Y/Zmodem protocols.

 	  http://www.ohse.de/uwe/software/lrzsz.html
+
+comment "lrzsz needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
@@ -9,6 +9,7 @@ config BR2_PACKAGE_LTRACE
 	select BR2_PACKAGE_ELFUTILS
 	depends on BR2_USE_WCHAR # elfutils
 	depends on !BR2_STATIC_LIBS # elfutils
+	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
 	help
 	  Debugging program which runs a specified command until it exits.
 	  While the command is executing, ltrace intercepts and records
@@ -17,5 +18,6 @@ config BR2_PACKAGE_LTRACE

 	  http://ltrace.org

-comment "ltrace needs toolchain w/ wchar, dynamic library"
-	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
+comment "ltrace needs a uclibc or (e)glibc toolchain w/ wchar, dynamic library"
+	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \
+		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
--- a/Show More
+++ b/Show More