Update for 2012.05-rc3

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

CHANGES

@@ -1,4 +1,29 @@
-2012.05-rc1, Released May 10th, 2012
+2012.05-rc3, Released May 25th, 2012:
+
+	Minor fixes around the tree.
+
+	Infra: Fix for DOWNLOAD macro when using primary mirrors with
+	scp targets.
+
+	Toolchain: Kernel headers 3.2.18 / 3.3.7.
+
+	Updated/fixed packages: binutils, bison, busybox, cifs-utils,
+	gnuchess, gpsd, iperf, libmpeg2, mtd, ntfs-3g, oprofile,
+	xserver-xorg
+
+2012.05-rc2, Released May 18th, 2012:
+
+	Fixes all over the tree.
+
+	Toolchain: uClibc: Use 0.9.33.2, Crosstool-ng: fix gperf
+	dependency, disable decimal floats support, Linux 3.2.17 /
+	3.3.6 kernel headers. Fix sysroot copy handling for toolchains
+	without C++ support.
+
+	Updated/fixed packages: apr, apr-util, ccache, dnsmasq,
+	heirloom-mailx, gdb, ndisc6, opencv, openssl, socat, vala
+
+2012.05-rc1, Released May 10th, 2012:
 
 	Fixes all over the tree and new features.
 

Config.in

@@ -198,6 +198,13 @@ config BR2_CCACHE
 	  ccache cache by removing the $HOME/.buildroot-ccache
 	  directory.
 
+config BR2_CCACHE_DIR
+	string "Compiler cache location"
+	depends on BR2_CCACHE
+	default "$(HOME)/.buildroot-ccache"
+	help
+	  Where ccache should store cached files.
+
 config BR2_DEPRECATED
 	bool "Show packages that are deprecated or obsolete"
 	help

Makefile

@@ -24,7 +24,7 @@
 #--------------------------------------------------------------
 
 # Set and export the version string
-export BR2_VERSION:=2012.05-rc1
+export BR2_VERSION:=2012.05-rc3
 
 # Check for minimal make version (note: this check will break at make 10.x)
 MIN_MAKE_VERSION=3.81
@@ -252,7 +252,8 @@ TARGET_SKELETON=$(TOPDIR)/fs/skeleton
 
 ifeq ($(BR2_CCACHE),y)
 CCACHE:=$(HOST_DIR)/usr/bin/ccache
-CCACHE_CACHE_DIR=$(HOME)/.buildroot-ccache
+BUILDROOT_CACHE_DIR = $(call qstrip,$(BR2_CCACHE_DIR))
+export BUILDROOT_CACHE_DIR
 HOSTCC  := $(CCACHE) $(HOSTCC)
 HOSTCXX := $(CCACHE) $(HOSTCXX)
 endif

configs/qemu_arm_versatile_defconfig

@@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.3.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

configs/qemu_arm_vexpress_defconfig

@@ -17,6 +17,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_ZIMAGE=y

configs/qemu_microblazebe_mmu_defconfig

@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/kernel-3.3.config"
 BR2_LINUX_KERNEL_DTS_FILE="board/qemu/microblazebe-mmu/system.dts"

configs/qemu_microblazeel_mmu_defconfig

@@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/kernel-3.3.config"
 BR2_LINUX_KERNEL_DTS_FILE="board/qemu/microblazeel-mmu/system.dts"

configs/qemu_mips_malta_defconfig

@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y

configs/qemu_mipsel_malta_defconfig

@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y

configs/qemu_ppc_g3beige_defconfig

@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.3.config"
 BR2_LINUX_KERNEL_VMLINUX=y

configs/qemu_ppc_mpc8544ds_defconfig

@@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx"
 BR2_LINUX_KERNEL_VMLINUX=y
 

configs/qemu_sh4_r2d_defconfig

@@ -20,7 +20,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu"
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.16"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.18"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config"
 BR2_LINUX_KERNEL_ZIMAGE=y

configs/qemu_sparc_ss10_defconfig

@@ -12,6 +12,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_DEFCONFIG="sparc32"
 BR2_LINUX_KERNEL_ZIMAGE=y

configs/qemu_x86_64_defconfig

@@ -15,6 +15,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.3.config"

configs/qemu_x86_defconfig

@@ -16,6 +16,6 @@ BR2_KERNEL_HEADERS_3_3=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.3.7"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.3.config"

docs/download.html

@@ -14,12 +14,12 @@ or
 <a href="/downloads/buildroot-2012.02.tar.bz2">buildroot-2012.02.tar.bz2</a>.
 <p>
 
-The latest release candidate is <b>2012.05-rc1</b>, which can be
+The latest release candidate is <b>2012.05-rc3</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2012.05-rc1.tar.gz">buildroot-2012.05-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2012.05-rc3.tar.gz">buildroot-2012.05-rc3.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.05-rc1.tar.bz2">buildroot-2012.05-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.05-rc3.tar.bz2">buildroot-2012.05-rc3.tar.bz2</a>.
 <p>
 
 This and earlier releases can always be downloaded from

docs/header.html

@@ -67,7 +67,7 @@
     <br><a href="http://www.ucdot.org/">uCdot</a>
     <br><a href="http://www.linuxdevices.com/">LinuxDevices</a>
     <br><a href="http://slashdot.org/">Slashdot</a>
-    <br><a href="http://freshmeat.net/">Freshmeat</a>
+    <br><a href="http://freecode.com/">Freecode</a>
     <br><a href="http://linuxtoday.com/">Linux Today</a>
     <br><a href="http://lwn.net/">Linux Weekly News</a>
     <br><a href="http://www.tldp.org/HOWTO">Linux HOWTOs</a>

docs/news.html

@@ -5,12 +5,38 @@
 <p>
 
 <ul>
+  <li><b>25 May 2012 -- 2012.05-rc3 released</b>
+
+    <p>RC3 is out with more bugfixes - See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.05_rc3">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.05-rc3.tar.bz2">2012.05-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>18 May 2012 -- 2012.05-rc2 released</b>
+
+    <p>Another week, another release candidate with more cleanups and
+    build fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.05_rc2">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.05-rc2.tar.bz2">2012.05-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>10 May 2012 -- 2012.05-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=2012.05_rc1">CHANGES</a>
-    file for details</p>
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2012-May/053736.html">announcement</a>.</p>
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2012.05-rc1.tar.bz2">2012.05-rc1

linux/Config.in

@@ -22,7 +22,7 @@ choice
 	default BR2_LINUX_KERNEL_3_3
 
 config BR2_LINUX_KERNEL_3_3
-	bool "3.3.5"
+	bool "3.3.7"
 
 config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	bool "Same as toolchain kernel headers"
@@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "3.3.5" if BR2_LINUX_KERNEL_3_3
+	default "3.3.7" if BR2_LINUX_KERNEL_3_3
 	default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL

package/apr-util/Config.in

@@ -5,6 +5,8 @@ config BR2_PACKAGE_APR_UTIL
 	select BR2_PACKAGE_NEON
 	select BR2_PACKAGE_NEON_ZLIB
 	select BR2_PACKAGE_ZLIB
+	# apr really needs shared library support
+	depends on !BR2_PREFER_STATIC_LIB
 	help
 	  The utility library for the apache runtime project
 

package/apr/Config.in

@@ -1,5 +1,7 @@
 config BR2_PACKAGE_APR
 	bool "apr"
+	# apr really needs shared library support
+	depends on !BR2_PREFER_STATIC_LIB
 	help
 	  The mission of the Apache Portable Runtime (APR) project is to create
 	  and maintain software libraries that provide a predictable and

package/binutils/binutils.mk

@@ -8,8 +8,13 @@
 # If not, we do like other packages
 BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION))
 ifeq ($(BINUTILS_VERSION),)
+ifeq ($(BR2_avr32),y)
+# avr32 uses a special version
+BINUTILS_VERSION = 2.18-avr32-1.0.1
+else
 BINUTILS_VERSION = 2.21
 endif
+endif
 
 BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.bz2
 BINUTILS_SITE = $(BR2_GNU_MIRROR)/binutils

package/bison/Config.in

@@ -2,6 +2,8 @@ config BR2_PACKAGE_BISON
 	bool "bison"
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_M4
+	# m4 uses fork()
+	depends on BR2_USE_MMU
 	help
 	  General-purpose parser generator that converts a
 	  grammar description for an LALR context-free grammar into a C

package/busybox/busybox-1.20.0/busybox-1.20.0-buildsys.patch

@@ -1,5 +1,14 @@
 --- busybox-1.20.0/archival/libarchive/Kbuild.src
 +++ busybox-1.20.0-buildsys/archival/libarchive/Kbuild.src
+@@ -45,7 +45,7 @@ lib-$(CONFIG_UNXZ)
+ lib-$(CONFIG_CPIO)                      += get_header_cpio.o
+ lib-$(CONFIG_DPKG)                      += $(DPKG_FILES)
+ lib-$(CONFIG_DPKG_DEB)                  += $(DPKG_FILES)
+-lib-$(CONFIG_GUNZIP)                    += decompress_gunzip.o
++lib-$(CONFIG_GUNZIP)                    += open_transformer.o decompress_gunzip.o
+ lib-$(CONFIG_RPM2CPIO)                  += decompress_gunzip.o get_header_cpio.o
+ lib-$(CONFIG_RPM)                       += open_transformer.o decompress_gunzip.o get_header_cpio.o
+ lib-$(CONFIG_TAR)                       += get_header_tar.o
 @@ -60,7 +60,7 @@ lib-$(CONFIG_FEATURE_SEAMLESS_GZ)
  lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2.o
  lib-$(CONFIG_FEATURE_SEAMLESS_LZMA)     += open_transformer.o decompress_unlzma.o

package/busybox/busybox-1.20.0/busybox-1.20.0-ext4.patch

@@ -0,0 +1,73 @@
+--- busybox-1.20.0/util-linux/volume_id/ext.c
++++ busybox-1.20.0-ext4/util-linux/volume_id/ext.c
+@@ -39,10 +39,50 @@ struct ext2_super_block {
+ 	uint8_t	volume_name[16];
+ } PACKED;
+ 
+-#define EXT3_FEATURE_COMPAT_HAS_JOURNAL		0x00000004
+-#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV	0x00000008
+ #define EXT_SUPERBLOCK_OFFSET			0x400
+ 
++/* for s_flags */
++#define EXT2_FLAGS_TEST_FILESYS			0x0004
++
++/* for s_feature_compat */
++#define EXT3_FEATURE_COMPAT_HAS_JOURNAL		0x0004
++
++/* for s_feature_ro_compat */
++#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER	0x0001
++#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE	0x0002
++#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR	0x0004
++#define EXT4_FEATURE_RO_COMPAT_HUGE_FILE	0x0008
++#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM		0x0010
++#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK	0x0020
++#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE	0x0040
++
++/* for s_feature_incompat */
++#define EXT2_FEATURE_INCOMPAT_FILETYPE		0x0002
++#define EXT3_FEATURE_INCOMPAT_RECOVER		0x0004
++#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV	0x0008
++#define EXT2_FEATURE_INCOMPAT_META_BG		0x0010
++#define EXT4_FEATURE_INCOMPAT_EXTENTS		0x0040 /* extents support */
++#define EXT4_FEATURE_INCOMPAT_64BIT		0x0080
++#define EXT4_FEATURE_INCOMPAT_MMP		0x0100
++#define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200
++
++#define EXT2_FEATURE_RO_COMPAT_SUPP	(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
++					 EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
++					 EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
++#define EXT2_FEATURE_INCOMPAT_SUPP	(EXT2_FEATURE_INCOMPAT_FILETYPE| \
++					 EXT2_FEATURE_INCOMPAT_META_BG)
++#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED	~EXT2_FEATURE_INCOMPAT_SUPP
++#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED	~EXT2_FEATURE_RO_COMPAT_SUPP
++
++#define EXT3_FEATURE_RO_COMPAT_SUPP	(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
++					 EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
++					 EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
++#define EXT3_FEATURE_INCOMPAT_SUPP	(EXT2_FEATURE_INCOMPAT_FILETYPE| \
++					 EXT3_FEATURE_INCOMPAT_RECOVER| \
++					 EXT2_FEATURE_INCOMPAT_META_BG)
++#define EXT3_FEATURE_INCOMPAT_UNSUPPORTED	~EXT3_FEATURE_INCOMPAT_SUPP
++#define EXT3_FEATURE_RO_COMPAT_UNSUPPORTED	~EXT3_FEATURE_RO_COMPAT_SUPP
++
+ int FAST_FUNC volume_id_probe_ext(struct volume_id *id /*,uint64_t off*/)
+ {
+ #define off ((uint64_t)0)
+@@ -66,11 +106,15 @@ int FAST_FUNC volume_id_probe_ext(struct
+ 	dbg("ext: label '%s' uuid '%s'", id->label, id->uuid);
+ 
+ #if ENABLE_FEATURE_BLKID_TYPE
+-	if ((le32_to_cpu(es->feature_compat) & EXT3_FEATURE_COMPAT_HAS_JOURNAL) != 0)
++	if ((es->feature_ro_compat & cpu_to_le32(EXT4_FEATURE_RO_COMPAT_HUGE_FILE | EXT4_FEATURE_RO_COMPAT_DIR_NLINK))
++	 || (es->feature_incompat & cpu_to_le32(EXT4_FEATURE_INCOMPAT_EXTENTS | EXT4_FEATURE_INCOMPAT_64BIT))
++	) {
++		id->type = "ext4";
++	}
++	else if (es->feature_compat & cpu_to_le32(EXT3_FEATURE_COMPAT_HAS_JOURNAL))
+ 		id->type = "ext3";
+ 	else
+ 		id->type = "ext2";
+ #endif
+-
+ 	return 0;
+ }

package/busybox/busybox-1.20.0/busybox-1.20.0-find.patch

@@ -0,0 +1,33 @@
+--- busybox-1.20.0/findutils/find.c
++++ busybox-1.20.0-find/findutils/find.c
+@@ -831,6 +831,11 @@ static action*** parse_params(char **arg
+ 	                        PARM_name      ,
+ 	                        PARM_iname     ,
+ 	IF_FEATURE_FIND_PATH(   PARM_path      ,)
++#if ENABLE_DESKTOP
++	/* -wholename is a synonym for -path */
++	/* We support it because Linux kernel's "make tags" uses it */
++	IF_FEATURE_FIND_PATH(   PARM_wholename ,)
++#endif
+ 	IF_FEATURE_FIND_PATH(   PARM_ipath     ,)
+ 	IF_FEATURE_FIND_REGEX(  PARM_regex     ,)
+ 	IF_FEATURE_FIND_TYPE(   PARM_type      ,)
+@@ -869,6 +874,9 @@ static action*** parse_params(char **arg
+ 	                         "-name\0"
+ 	                         "-iname\0"
+ 	IF_FEATURE_FIND_PATH(   "-path\0"   )
++#if ENABLE_DESKTOP
++	IF_FEATURE_FIND_PATH(   "-wholename\0")
++#endif
+ 	IF_FEATURE_FIND_PATH(   "-ipath\0"  )
+ 	IF_FEATURE_FIND_REGEX(  "-regex\0"  )
+ 	IF_FEATURE_FIND_TYPE(   "-type\0"   )
+@@ -1076,7 +1084,7 @@ static action*** parse_params(char **arg
+ 			ap->iname = (parm == PARM_iname);
+ 		}
+ #if ENABLE_FEATURE_FIND_PATH
+-		else if (parm == PARM_path || parm == PARM_ipath) {
++		else if (parm == PARM_path IF_DESKTOP(|| parm == PARM_wholename) || parm == PARM_ipath) {
+ 			action_path *ap;
+ 			dbg("%d", __LINE__);
+ 			ap = ALLOC_ACTION(path);

package/busybox/busybox-1.20.0/busybox-1.20.0-mdev.patch

@@ -0,0 +1,72 @@
+--- busybox-1.20.0/util-linux/mdev.c
++++ busybox-1.20.0-mdev/util-linux/mdev.c
+@@ -661,37 +661,45 @@ static int FAST_FUNC dirAction(const cha
+ static void load_firmware(const char *firmware, const char *sysfs_path)
+ {
+ 	int cnt;
+-	int firmware_fd, loading_fd, data_fd;
++	int firmware_fd, loading_fd;
+ 
+ 	/* check for /lib/firmware/$FIRMWARE */
+ 	xchdir("/lib/firmware");
+-	firmware_fd = xopen(firmware, O_RDONLY);
+-
+-	/* in case we goto out ... */
+-	data_fd = -1;
++	firmware_fd = open(firmware, O_RDONLY); /* can fail */
+ 
+ 	/* check for /sys/$DEVPATH/loading ... give 30 seconds to appear */
+ 	xchdir(sysfs_path);
+ 	for (cnt = 0; cnt < 30; ++cnt) {
+ 		loading_fd = open("loading", O_WRONLY);
+-		if (loading_fd != -1)
++		if (loading_fd >= 0)
+ 			goto loading;
+ 		sleep(1);
+ 	}
+ 	goto out;
+ 
+  loading:
+-	/* tell kernel we're loading by "echo 1 > /sys/$DEVPATH/loading" */
+-	if (full_write(loading_fd, "1", 1) != 1)
+-		goto out;
+-
+-	/* load firmware into /sys/$DEVPATH/data */
+-	data_fd = open("data", O_WRONLY);
+-	if (data_fd == -1)
+-		goto out;
+-	cnt = bb_copyfd_eof(firmware_fd, data_fd);
++	cnt = 0;
++	if (firmware_fd >= 0) {
++		int data_fd;
++
++		/* tell kernel we're loading by "echo 1 > /sys/$DEVPATH/loading" */
++		if (full_write(loading_fd, "1", 1) != 1)
++			goto out;
++
++		/* load firmware into /sys/$DEVPATH/data */
++		data_fd = open("data", O_WRONLY);
++		if (data_fd < 0)
++			goto out;
++		cnt = bb_copyfd_eof(firmware_fd, data_fd);
++		if (ENABLE_FEATURE_CLEAN_UP)
++			close(data_fd);
++	}
+ 
+-	/* tell kernel result by "echo [0|-1] > /sys/$DEVPATH/loading" */
++	/* Tell kernel result by "echo [0|-1] > /sys/$DEVPATH/loading"
++	 * Note: we emit -1 if firmware file wasn't found.
++	 * There are cases when otherwise kernel would wait for minutes
++	 * before timing out.
++	 */
+ 	if (cnt > 0)
+ 		full_write(loading_fd, "0", 1);
+ 	else
+@@ -701,7 +709,6 @@ static void load_firmware(const char *fi
+ 	if (ENABLE_FEATURE_CLEAN_UP) {
+ 		close(firmware_fd);
+ 		close(loading_fd);
+-		close(data_fd);
+ 	}
+ }
+ 

package/ccache/ccache.mk

@@ -25,22 +25,22 @@ HOST_CCACHE_CONF_ENV = \
 # has zero dependency besides the C library.
 HOST_CCACHE_CONF_OPT += ccache_cv_zlib_1_2_3=no
 
-# We directly hardcode configuration into the binary, as it is much
-# easier to handle than passing an environment variable. Our
-# configuration is:
-#  - the cache location
-#  - the fact that ccache shouldn't use the compiler binary mtime to
-#  - detect a change in the compiler, because in the context of
-#  - Buildroot, that completely defeats the purpose of ccache. Of
-#  - course, that leaves the user responsible for purging its cache
-#  - when the compiler changes.
-define HOST_CCACHE_FIX_CCACHE_DIR
-	sed -i 's,getenv("CCACHE_DIR"),"$(CCACHE_CACHE_DIR)",' $(@D)/ccache.c
+# Patch host-ccache as follows:
+#  - Use BUILDROOT_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR
+#    is already used by autotargets for the ccache package.
+#    BUILDROOT_CACHE_DIR is exported by Makefile based on config option
+#    BR2_CCACHE_DIR.
+#  - ccache shouldn't use the compiler binary mtime to detect a change in
+#    the compiler, because in the context of Buildroot, that completely
+#    defeats the purpose of ccache. Of course, that leaves the user
+#    responsible for purging its cache when the compiler changes.
+define HOST_CCACHE_PATCH_CONFIGURATION
+	sed -i 's,getenv("CCACHE_DIR"),getenv("BUILDROOT_CACHE_DIR"),' $(@D)/ccache.c
 	sed -i 's,getenv("CCACHE_COMPILERCHECK"),"none",' $(@D)/ccache.c
 endef
 
 HOST_CCACHE_POST_CONFIGURE_HOOKS += \
-	HOST_CCACHE_FIX_CCACHE_DIR
+	HOST_CCACHE_PATCH_CONFIGURATION
 
 $(eval $(call AUTOTARGETS))
 $(eval $(call AUTOTARGETS,host))

package/cifs-utils/Config.in

@@ -1,5 +1,7 @@
 config BR2_PACKAGE_CIFS_UTILS
 	bool "cifs-utils"
+	# uses fork()
+	depends on BR2_USE_MMU
 	help
 	  The in-kernel CIFS filesystem is generally the preferred
 	  method for mounting SMB/CIFS shares on Linux. The in-kernel

package/crosstool-ng/crosstool-ng.mk

@@ -3,6 +3,6 @@ CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_TARGET    = NO
 CROSSTOOL_NG_MAKE              = $(MAKE1)
-HOST_CROSSTOOL_NG_DEPENDENCIES = $(if $(BR2_CCACHE),host-ccache) host-gawk host-automake
+HOST_CROSSTOOL_NG_DEPENDENCIES = $(if $(BR2_CCACHE),host-ccache) host-gawk host-automake host-gperf
 
 $(eval $(call AUTOTARGETS,host))

package/directfb/Config.in

@@ -53,10 +53,6 @@ config BR2_PACKAGE_DIRECTFB_EP9X
 	bool "compile ep9x graphics driver"
 	depends on BR2_arm
 
-config BR2_PACKAGE_DIRECTFB_DAVINCI
-	bool "compile TI DaVinci graphics driver"
-	depends on BR2_arm
-
 config BR2_PACKAGE_DIRECTFB_UNICHROME
 	bool "compile unichrome graphics driver"
 	default y

package/directfb/directfb.mk

@@ -58,8 +58,7 @@ DIRECTFB_GFX := \
 	$(if $(BR2_PACKAGE_DIRECTFB_PXA3XX),pxa3xx) \
 	$(if $(BR2_PACKAGE_DIRECTFB_UNICHROME),unichrome) \
 	$(if $(BR2_PACKAGE_DIRECTFB_I830),i830)	\
-	$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x) \
-	$(if $(BR2_PACKAGE_DIRECTFB_DAVINCI),davinci)
+	$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x)
 
 ifeq ($(strip $(DIRECTFB_GFX)),)
 DIRECTFB_GFX:=none

package/dnsmasq/dnsmasq.mk

@@ -42,11 +42,9 @@ endef
 endif
 
 ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y)
-	DNSMASQ_DEPENDENCIES += lua
+	DNSMASQ_DEPENDENCIES += lua host-pkg-config
 	DNSMASQ_MAKE_OPT += LDFLAGS+="-ldl"
-endif
 
-ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y)
 define DNSMASQ_ENABLE_LUA
 	$(SED) 's/lua5.1/lua/g' $(DNSMASQ_DIR)/Makefile
 	$(SED) 's^.*#define HAVE_LUASCRIPT.*^#define HAVE_LUASCRIPT^' \

package/games/gnuchess/Config.in

@@ -1,6 +1,10 @@
 config BR2_PACKAGE_GNUCHESS
 	bool "gnuchess"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  GNU Chess lets most modern computers play a full game of chess.
 
 	  http://ftp.gnu.org/pub/gnu/chess
+
+comment "gnuchess requires a toolchain with thread support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

package/heirloom-mailx/heirloom-mailx.mk

@@ -12,6 +12,10 @@ ifeq ($(BR2_PACKAGE_OPENSSL),y)
 HEIRLOOM_MAILX_DEPENDENCIES += openssl
 endif
 
+define HEIRLOOM_MAILX_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) $(SHELL) ./makeconfig)
+endef
+
 define HEIRLOOM_MAILX_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
 endef

package/iperf/Config.in

@@ -1,6 +1,8 @@
 config BR2_PACKAGE_IPERF
 	bool "iperf"
 	depends on BR2_INSTALL_LIBSTDCPP
+	# uses fork()
+	depends on BR2_USE_MMU
 	help
 	  Internet Protocol bandwidth measuring tool for measuring
 	  TCP/UDP performance.

package/mtd/mtd.mk

@@ -68,12 +68,17 @@ MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL)	+= ubiupdatevol
 
 MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y))
 
+# only call make if atleast a single tool is enabled
+ifneq ($(MTD_TARGETS_y),)
+
 define MTD_BUILD_CMDS
 	$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \
 		BUILDDIR=$(@D) WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1 -C $(@D) \
 		$(addprefix $(@D)/,$(MTD_TARGETS_y))
 endef
 
+endif
+
 define MTD_INSTALL_TARGET_CMDS
  for f in $(MTD_TARGETS_y) ; do \
   install -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$${f##*/} ; \

package/ndisc6/ndisc6.mk

@@ -10,6 +10,11 @@ NDISC6_SITE = http://www.remlab.net/files/ndisc6/
 NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
 NDISC6_CONF_OPT = --localstatedir=/var --disable-rpath --disable-suid-install
 
+ifeq ($(BR2_PACKAGE_LIBINTL),y)
+NDISC6_DEPENDENCIES += libintl
+NDISC6_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
+endif
+
 NDISC6_BIN_ += dnssort # perl script
 NDISC6_BIN_$(BR2_PACKAGE_NDISC6_NAME2ADDR) += name2addr addr2name
 NDISC6_BIN_$(BR2_PACKAGE_NDISC6_TCPSPRAY) += tcpspray tcpspray6

package/ntfs-3g/ntfs-3g.mk

@@ -21,6 +21,7 @@ ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y)
 endif
 
 ifeq ($(BR2_PACKAGE_NTFS_3G_ENCRYPTED),y)
+	NTFS_3G_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
 	NTFS_3G_CONF_OPT += --enable-crypto
 	NTFS_3G_DEPENDENCIES += gnutls
 endif

package/opencv/opencv.mk

@@ -35,6 +35,8 @@ OPENCV_CONF_OPT = \
 	-DWITH_UNICAP=OFF \
 	-DWITH_XINE=OFF
 
+OPENCV_DEPENDENCIES += zlib
+
 ifeq ($(BR2_PACKAGE_OPENCV_WITH_PYTHON),y)
 OPENCV_CONF_OPT += -DBUILD_NEW_PYTHON_SUPPORT=ON
 OPENCV_DEPENDENCIES += python

package/openssl/openssl.mk

@@ -4,7 +4,7 @@
 #
 #############################################################
 
-OPENSSL_VERSION = 1.0.0i
+OPENSSL_VERSION = 1.0.0j
 OPENSSL_SITE = http://www.openssl.org/source
 OPENSSL_INSTALL_STAGING = YES
 OPENSSL_DEPENDENCIES = zlib

package/oprofile/oprofile.mk

@@ -30,7 +30,10 @@ OPROFILE_DEPENDENCIES = popt binutils
 define OPROFILE_INSTALL_TARGET_CMDS
 	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin
 	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/oprofile
-	cp -dpfr $(@D)/events/$(OPROFILE_ARCH) $(TARGET_DIR)/usr/share/oprofile
+	if [ -d $(@D)/events/$(OPROFILE_ARCH) ]; then \
+		cp -dpfr $(@D)/events/$(OPROFILE_ARCH) \
+			$(TARGET_DIR)/usr/share/oprofile; \
+	fi
 	$(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile
 	$(INSTALL) -m 755 $(@D)/utils/opcontrol $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin

package/pkg-download.mk

@@ -206,7 +206,7 @@ endef
 define DOWNLOAD_INNER
 	$(Q)if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \
 		case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \
-			scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE),$(2)) && exit ;; \
+			scp) $(call $(DL_MODE)_SCP,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \
 			*) $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \
 		esac ; \
 	fi ; \

package/socat/socat-no-documentation.patch

@@ -0,0 +1,37 @@
+socat: disable documentation build/installation
+
+The documentation generation process requires a special yold2man
+program, for which we don't have a package in Buildroot. Since we
+generally don't care much about documentation of packages, just adjust
+the package Makefile.in to not build/install its documentation.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -93,7 +93,7 @@
+ 	Config/Makefile.Cygwin-1-5-25 Config/config.Cygwin-1-5-25.h \
+ 	Config/Makefile.MacOSX-10-5 Config/config.MacOSX-10-5.h
+ 
+-all: progs doc
++all: progs
+ 
+ scmclean: gitclean
+ 
+@@ -136,13 +136,11 @@
+ strip: progs
+ 	strip $(PROGS)
+ 
+-install: progs $(srcdir)/doc/socat.1
++install: progs
+ 	mkdir -p $(DESTDIR)$(BINDEST)
+ 	$(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST)
+ 	$(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST)
+ 	$(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST)
+-	mkdir -p $(DESTDIR)$(MANDEST)/man1
+-	$(INSTALL) -m 644 $(srcdir)/doc/socat.1 $(DESTDIR)$(MANDEST)/man1/
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(BINDEST)/socat

package/socat/socat.mk

@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SOCAT_VERSION = 2.0.0-b4
+SOCAT_VERSION = 2.0.0-b5
 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
 SOCAT_SITE = http://www.dest-unreach.org/socat/download/
 SOCAT_CONF_ENV = sc_cv_termios_ispeed=no \
@@ -12,4 +12,17 @@ SOCAT_CONF_ENV = sc_cv_termios_ispeed=no \
 		 sc_cv_sys_tabdly_shift=11 \
 		 sc_cv_sys_csize_shift=4
 
+# We need to run autoconf to regenerate the configure script, in order
+# to ensure that the test checking linux/ext2_fs.h works
+# properly. However, the package only uses autoconf and not automake,
+# so we can't use the normal autoreconf logic.
+
+SOCAT_DEPENDENCIES = host-autoconf
+
+define SOCAT_RUN_AUTOCONF
+	(cd $(@D); $(HOST_DIR)/usr/bin/autoconf)
+endef
+
+SOCAT_PRE_CONFIGURE_HOOKS += SOCAT_RUN_AUTOCONF
+
 $(eval $(call AUTOTARGETS))

package/vala/vala-0.15.2-dont-add-dirty-to-valac-version.patch

@@ -0,0 +1,25 @@
+valac: don't append -dirty to version
+
+Don't append -dirty to the valac version number if the Buildroot Git
+tree has uncommited changes.
+
+The patched script is meant for the valac developers, but it also
+activates if you build valac in a subdirectory of a Git tree (e.g.
+as is commonly done in Buildroot).
+
+The effect is that valac gets built as being version x.y.z-dirty, which
+breaks programs (such as Midori) that explicitly check for valac-x.y.z.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+diff -Nur a/build-aux/git-version-gen b/build-aux/git-version-gen
+--- a/build-aux/git-version-gen	2010-08-15 12:49:03.000000000 +0100
++++ b/build-aux/git-version-gen	2012-05-14 10:17:19.977204570 +0100
+@@ -135,7 +135,7 @@
+     *) # Append the suffix only if there isn't one already.
+ 	case $v in
+ 	  *-dirty) ;;
+-	  *) v="$v-dirty" ;;
++	  #*) v="$v-dirty" ;;
+ 	esac ;;
+ esac
+ 

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

@@ -58,6 +58,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = 	\
 
 XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
 		--disable-xnest --disable-xephyr --disable-xvfb \
+		--disable-dmx \
 		--with-builder-addr=buildroot@uclibc.org \
 		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \
 		--with-fontdir=/usr/share/fonts/X11/ --localstatedir=/var

support/scripts/apply-patches.sh

@@ -4,6 +4,29 @@
 # -Erik
 #
 # (c) 2002 Erik Andersen <andersen@codepoet.org>
+#
+# Parameters:
+# - the build directory, optional, default value is '.'. The place where are
+# the package sources.
+# - the patch directory, optional, default '../kernel-patches'. The place
+# where are the scripts you want to apply.
+# - other parameters are the patch name patterns, optional, default value is
+# '*'. Pattern(s) describing the patch names you want to apply.
+#
+# The script will look recursively for patches from the patch directory. If a
+# file is named 'series' then only patches mentionned into it will be applied.
+# If not, the script will look for file names matching pattern(s). If the name
+# ends with '.tar.*', '.tbz2' or '.tgz', the file is considered as an archive
+# and will be uncompressed into a directory named
+# '.patches-name_of_the_archive-unpacked'. It's the turn of this directory to
+# be scanned with '*' as pattern. Remember that scanning is recursive. Other
+# files than series file and archives are considered as a patch.
+#
+# Once a patch is found, the script will try to apply it. If its name doesn't
+# end with '.gz', '.bz', '.bz2', '.zip', '.Z', '.diff*' or '.patch*', it will
+# be skipped. If necessary, the patch will be uncompressed before being
+# applied. The list of the patches applied is stored in '.applied_patches_list'
+# file in the build directory.
 
 # Set directories from arguments, or use defaults.
 builddir=${1-.}

toolchain/gdb/Config.in

@@ -5,7 +5,7 @@ config BR2_PACKAGE_GDB
 	select BR2_PACKAGE_NCURSES
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_sh && !BR2_sh64
+	depends on !BR2_sh && !BR2_sh64 && !BR2_avr32
 	help
 	    Build the full gdb debugger to run on the target.
 

toolchain/kernel-headers/Config.in

@@ -63,9 +63,9 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "2.6.37.6"	if BR2_KERNEL_HEADERS_2_6_37
 	default "2.6.38.8"	if BR2_KERNEL_HEADERS_2_6_38
 	default "2.6.39.4"	if BR2_KERNEL_HEADERS_2_6_39
-	default "3.0.31"	if BR2_KERNEL_HEADERS_3_0
+	default "3.0.32"	if BR2_KERNEL_HEADERS_3_0
 	default "3.1.10"	if BR2_KERNEL_HEADERS_3_1
-	default "3.2.16"	if BR2_KERNEL_HEADERS_3_2
-	default "3.3.5"		if BR2_KERNEL_HEADERS_3_3
+	default "3.2.18"	if BR2_KERNEL_HEADERS_3_2
+	default "3.3.7"		if BR2_KERNEL_HEADERS_3_3
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc

@@ -294,8 +294,8 @@ CT_CC_LANG_CXX=y
 # gcc other options
 #
 CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
-CT_CC_EXTRA_CONFIG_ARRAY=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
+CT_CC_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
 CT_CC_STATIC_LIBSTDCXX=y
 
 #

toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc

@@ -294,8 +294,8 @@ CT_CC_LANG_CXX=y
 # gcc other options
 #
 CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
-CT_CC_EXTRA_CONFIG_ARRAY=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
+CT_CC_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
 CT_CC_STATIC_LIBSTDCXX=y
 
 #

toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc

@@ -293,8 +293,8 @@ CT_CC_LANG_CXX=y
 # gcc other options
 #
 CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
-CT_CC_EXTRA_CONFIG_ARRAY=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
+CT_CC_EXTRA_CONFIG_ARRAY="--disable-decimal-float"
 CT_CC_STATIC_LIBSTDCXX=y
 
 #

toolchain/toolchain-external/ext-tool.mk

@@ -384,11 +384,12 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked
 	ARCH_LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libc.a)` ; \
 	ARCH_SYSROOT_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/(.*/)?libc\.a::'` ; \
 	ARCH_LIB_DIR=`echo $${ARCH_LIBC_A_LOCATION} | sed -r -e 's:.*/usr/(lib(64)?)/(.*/)?libc.a:\1:'` ; \
+	SUPPORT_LIB_DIR="" ; \
 	if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
-		LIBSTDCPP_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a)` ; \
-		SUPPORT_LIB_DIR=`echo $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \
-	else \
-		SUPPORT_LIB_DIR="" ; \
+		LIBSTDCPP_A_LOCATION=$$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS) -print-file-name=libstdc++.a) ; \
+		if [ -e "$${LIBSTDCPP_A_LOCATION}" ]; then \
+			SUPPORT_LIB_DIR=`readlink -f $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \
+		fi ; \
 	fi ; \
 	ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
 	mkdir -p $(TARGET_DIR)/lib ; \

toolchain/uClibc/Config.in

@@ -37,7 +37,7 @@ config BR2_UCLIBC_VERSION_STRING
 	string
 	default 0.9.31.1	if BR2_UCLIBC_VERSION_0_9_31
 	default 0.9.32.1	if BR2_UCLIBC_VERSION_0_9_32
-	default 0.9.33.1	if BR2_UCLIBC_VERSION_0_9_33
+	default 0.9.33.2	if BR2_UCLIBC_VERSION_0_9_33
 	default $BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_UCLIBC_CONFIG

toolchain/uClibc/uClibc-0.9.33.1-mmap64-include-stdint.h-for-uint64_t.patch

@@ -1,28 +0,0 @@
-From 47009e1e1c6b721c38b5ffa2eeb9202fb8db298a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 11 Apr 2012 16:01:29 -0400
-Subject: [PATCH 1/2] mmap64: include stdint.h for uint64_t
-
-Some targets include this implicitly, but pull it in explicitly for those
-which don't to fix building for them.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- libc/sysdeps/linux/common/mmap64.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c
-index 3c97c84..cebf961 100644
---- a/libc/sysdeps/linux/common/mmap64.c
-+++ b/libc/sysdeps/linux/common/mmap64.c
-@@ -10,6 +10,7 @@
- #ifdef __UCLIBC_HAS_LFS__
- 
- #include <errno.h>
-+#include <stdint.h>
- #include <unistd.h>
- #include <sys/mman.h>
- #include <sys/syscall.h>
--- 
-1.7.3.4
-

toolchain/uClibc/uClibc-0.9.33.1-version.patch

@@ -1,23 +0,0 @@
-[PATCH] fix version number
-
-Somehow the 0.9.33.1 tarball thinks it is 0.9.33.2-git, as pointed out
-by Mike Frysinger.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- Rules.mak |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: uClibc-0.9.33.1/Rules.mak
-===================================================================
---- uClibc-0.9.33.1.orig/Rules.mak
-+++ uClibc-0.9.33.1/Rules.mak
-@@ -105,7 +105,7 @@
- MAJOR_VERSION := 0
- MINOR_VERSION := 9
- SUBLEVEL      := 33
--EXTRAVERSION  :=.2-git
-+EXTRAVERSION  :=.1
- VERSION       := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL)
- ABI_VERSION   := $(MAJOR_VERSION)
- ifneq ($(EXTRAVERSION),)