update for 2010.05

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

CHANGES

@@ -1,3 +1,41 @@
+2010.05, Released May 30th, 2010:
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: coreutils, hal, libcap,
+	lockfile-progs, ncftp, xserver_xorg-server
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#1789: binutils fails to build for i386
+	#1843: Fix libcap build failure
+	#1855: XORG Keyboard driver fails to compile
+
+2010.05-rc3, Released May 27th, 2010:
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: aumix, atk, avahi, bmon, busybox, cairo,
+	cdrkit, dbus-glib, dbus-python, docker, enchant, fltk, gamin,
+	gettext, gmpc, gob2, grep, gstreamer, gst-plugins-bad,
+	gst-plugins-base, gvfs, hal, iconv, icu, iperf, libcgicc,
+	libdvdnav, libdvdread, libglade, libglib2, libgtk2, libidn,
+	libmms, libmpd, libpcap, libsoup, lmbench, lsof, ltrace, lvm2,
+	make, metacity, microperl, mtd-utils, mutt, nbd, netsnmp,
+	ntfsprogs, ntp, olsr, pango, pciutils, pcmanfm, php,
+	pkg-config, psmisc, qt, samba, shared-mime-info, squashfs,
+	squashfs3, sshfs, startup-notification, swfdec, sylpheed,
+	uemacs, util-linux, valgrind, vpnc, vsftpd, webkit, xstroke
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#75: arm buildroot "unrecognized option" error
+	#699: Buildroot fails to copy libstdc++ to target when using external...
+	#1693: NTP trys IPV6 even if not configured error: 'IPV6_MULTICAST...
+	#1729: alsamixergui fails to build
+	#1801: Avahi-autoipd doesn't create TARGET_DIR/var/lib
+	#1819: pciutils small bugs
+
 2010.05-rc2, Released May 11th, 2010:
 
 	Fixes all over the tree.

Config.in

@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG
 
 config BR2_VERSION
 	string
-	default "2010.05-rc2
+	default "2010.05"
 
 source "target/Config.in.arch"
 source "target/device/Config.in"

Makefile

@@ -320,8 +320,6 @@ ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
 TARGETS+=target-purgelocales
 endif
 
-include fs/common.mk
-
 # target stuff is last so it can override anything else
 include target/Makefile.in
 
@@ -449,6 +447,9 @@ external-deps:
 	@$(MAKE) -Bs BR2_WGET=$(TOPDIR)/toolchain/wget-show-external-deps.sh \
 		SPIDER=--spider source
 
+show-targets:
+	@echo $(TARGETS)
+
 ifeq ($(BR2_CONFIG_CACHE),y)
 # drop configure cache if configuration is changed
 $(BUILD_DIR)/tgt-config.cache: .config

configs/arm_toolchain_defconfig

@@ -712,7 +712,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # filesystem for target device
 #
-BR2_ROOTFS_DEVICE_TABLE="target/device/generic/device_table.txt"
+BR2_ROOTFS_DEVICE_TABLE="target/generic/device_table.txt"
 # BR2_TARGET_ROOTFS_CRAMFS is not set
 # BR2_TARGET_ROOTFS_CLOOP is not set
 # BR2_TARGET_ROOTFS_EXT2 is not set

docs/about.html

@@ -12,22 +12,53 @@
 </a>
 </div>
 
-Buildroot is a set of Makefiles and patches that makes it easy to generate a
-cross-compilation toolchain and root filesystem for your target Linux
-system using the <a href= "http://www.uclibc.org/">uClibc C library</a>.
-Buildroot is useful mainly for people working with small or embedded
-systems.  Embedded systems often use processors that are not the regular
-x86 processors everyone is used to using on their PC. It can be PowerPC
-processors, MIPS processors, ARM processors, etc.  And to be extra safe,
-you do not need to be root to build or run Buildroot.
+<p>Buildroot is a set of Makefiles and patches that makes it easy to
+generate a complete embedded Linux system. Buildroot can generate any
+or all of a cross-compilation toolchain, a root filesystem, a kernel
+image and a bootloader image. Buildroot is useful mainly for people
+working with small or embedded systems, using various CPU
+architectures (x86, ARM, MIPS, PowerPC, etc.) : it automates the
+building process of your embedded system and eases the
+cross-compilation process.</p>
 
-<p>
+<p>The major Buildroot features are:</p>
 
-Buildroot is maintained by <a href=
-"mailto:jacmet@uclibc.org">Peter Korsgaard</a>, and
-licensed under the
+<ul>
+
+  <li>Can <b>handle everything</b> in your embedded system development
+  project: cross-compiling toolchain, root filesystem generation,
+  kernel image compilation and bootloader compilation. Buildroot is
+  also sufficiently flexible that it can also be used for only one or
+  several of these steps.</li>
+
+  <li>Is <b>very easy</b> to set up, thanks to its menuconfig and
+  xconfig configuration interfaces, familiar to all embedded Linux
+  developers. Building a basic embedded Linux system with Buildroot
+  typically takes 15-30 minutes.</li>
+
+  <li>Supports <b>several hundreds of packages</b> for userspace
+  applications and libraries: X.org stack, Gtk2, Qt, DirectFB, SDL,
+  GStreamer and a large number of network-related and system-related
+  utilities and libraries are supported.</li>
+
+  <li>Supports <b>multiple filesystem types</b> for the root
+  filesystem image: JFFS2, UBIFS, tarballs, romfs, cramfs, squashfs
+  and more.</li>
+
+  <li>Can generate an uClibc cross-compilation toolchain, or re-use
+  your existing glibc, eglibc or uClibc cross-compilation
+  toolchain</li>
+
+  <li>Has a <b>simple structure</b> that makes it easy to understand
+  and extend. It relies only on the well-know Makefile language.</li>
+
+</ul>
+
+<p>Buildroot is maintained by <a href=
+"mailto:jacmet@uclibc.org">Peter Korsgaard</a>, and licensed under the
 <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU
-GENERAL PUBLIC LICENSE V2 (Or later)</a>.
+GENERAL PUBLIC LICENSE V2 (Or later)</a>. Stable releases are
+delivered every three months.</p>
 
 
 <!--#include file="footer.html" -->

docs/buildroot.html

@@ -798,6 +798,8 @@ community support.</p>
 	<li><a href="#manual-tutorial">Manual Makefile : tutorial</a></li>
       </ul>
       </li>
+      <li><a href="#gettext-integration">Gettext integration and
+      interaction with packages</a></li>
     </ul>
 
     <h3><a name="package-directory"></a>Package directory</h3>
@@ -1583,6 +1585,62 @@ LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP
     line <a href="#ex2line40">40</a>, which is used by Buildroot to download,
     compile, and then install this package. </p>
 
+    <h3><a name="gettext-integration"></a>Gettext integration and
+    interaction with packages</h3>
+
+    <p>Many packages that support internationalization use the gettext
+    library. Dependency on this library are fairly complicated and
+    therefore deserves a few explanations.</p>
+
+    <p>The <i>uClibc</i> C library doesn't implement gettext
+    functionality, therefore with this C library, a separate gettext
+    must be compiled. On the other hand, the <i>glibc</i> C library
+    does integrate its own gettext, and in this case, the separate
+    gettext library should not be compiled, because it creates various
+    kind of build failures.</p>
+
+    <p>Additionnaly, some packages (such as libglib2) do require
+    gettext unconditionnally, while other packages (those who
+    support <code>--disable-nls</code> in general) only require
+    gettext when locale support is enabled.</p>
+
+    <p>Therefore, Buildroot defines two configuration options:</p>
+
+    <ul>
+      <li><code>BR2_NEEDS_GETTEXT</code>, which is true as soon as the
+      toolchain doesn't provide its own gettext implementation</li>
+
+      <li><code>BR2_NEEDS_GETTEXT_IF_LOCALE</code>, which is true if
+      the toolchain doesn't provide its own gettext implementation and
+      if locale support is enabled</li>
+
+    </ul>
+
+    <p>Therefore, packages that unconditionnally need gettext should:</p>
+
+    <ol>
+      <li>Use <code>select BR2_PACKAGE_GNUTTEXT if
+      BR2_NEEDS_GETTEXT</code> and possibly <code>select
+      BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT</code> if libintl is
+      also needed</li>
+
+      <li>Use <code>$(if $(BR2_NEEDS_GETTEXT),gettext)</code> in the
+      package <code>DEPENDENCIES</code> variable</li>
+    </ol>
+
+    <p>Packages that need gettext only when locale support is enabled
+    should:</p>
+
+    <ol>
+      <li>Use <code>select BR2_PACKAGE_GNUTTEXT if
+      BR2_NEEDS_GETTEXT_IF_LOCALE</code> and possibly <code>select
+      BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE</code> if
+      libintl is also needed</li>
+
+      <li>Use <code>$(if
+      $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)</code> in the
+      package <code>DEPENDENCIES</code> variable</li>
+    </ol>
 
     <h3>Conclusion</h3>
 

docs/docs.html

@@ -1,35 +1,32 @@
 <!--#include file="header.html" -->
 
-
 <h3>Documentation</h3>
-Documentation for buildroot includes:
+
+<p>Our document "Buildroot usage and documentation" is where you want
+to start reading if you wish to understand how Buildroot work, or wish
+to change/extend/fix things. If you find any errors (factual,
+grammatical, whatever) please report them. Choose between:</p>
+
+<ul>
+  <li><a href="/downloads/buildroot.html">Latest stable release</a></li>
+  <li><a href="buildroot.html">GIT head revision</a></li>
+</ul>
+
+<p>If you find that you need help with Buildroot, you can ask for
+help:</p>
 
 <ul>
 
-  <li>
-    Usage and documentation is where you want to start reading if you
-    wish to understand how buildroot work, or wish to
-    change/extend/fix things. If you find any errors (factual,
-    grammatical, whatever) please report them. Choose between:
-    <p>
-    <ul>
-      <li><a href="/downloads/buildroot.html">Latest stable release</a></li>
-      <li><a href="buildroot.html">GIT head revision</a></li>
-    </ul>
-    <p>
-  </li>
+  <li>On the <a href="lists.html">buildroot mailing list</a>
+  at <code>buildroot at uclibc.org</code></li>
 
-  <li>
-    <a href="README">README</a>. This is the README file included in the
-    buildroot source release.
-  </li>
+  <li>On the <a href="irc://freenode.net/#uclibc">Buildroot IRC
+  channel</a>, <code>#uclibc</code> on Freenode</li>
 
-  <li>
-    If you find that you need help with buildroot, you can ask for help on the
-    <a href= "lists.html">buildroot mailing list</a> at buildroot at uclibc.org.
-    In addition the BusyBox, uClibc, and buildroot developers are also known to
-    hang out on the uClibc IRC channel: #uclibc on irc.freenode.net.
-  </li>
+  <li>On our <a href="https://bugs.uclibc.org">bugtracker</a>.</li>
+
+  <li>Through the various companies offering commercial Buildroot
+  support.</li>
 
 </ul>
 

docs/download.html

@@ -6,22 +6,22 @@
 
 <p>
 
-The latest stable release is <b>2010.02</b>, which can be downloaded
+The latest stable release is <b>2010.05</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2010.02.tar.gz">buildroot-2010.02.tar.gz</a>
+<a href="/downloads/buildroot-2010.05.tar.gz">buildroot-2010.05.tar.gz</a>
 or
-<a href="/downloads/buildroot-2010.02.tar.bz2">buildroot-2010.02.tar.bz2</a>.
+<a href="/downloads/buildroot-2010.05.tar.bz2">buildroot-2010.05.tar.bz2</a>.
 <p>
-
-The latest release candidate is <b>2010.05-rc2</b>, which can be
+<!--
+The latest release candidate is <b>2010.05-rc3</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2010.05-rc2.tar.gz">buildroot-2010.05-rc2.tar.gz</a>
+<a href="/downloads/buildroot-2010.05-rc3.tar.gz">buildroot-2010.05-rc3.tar.gz</a>
 or
-<a href="/downloads/buildroot-2010.05-rc2.tar.bz2">buildroot-2010.05-rc2.tar.bz2</a>.
+<a href="/downloads/buildroot-2010.05-rc3.tar.bz2">buildroot-2010.05-rc3.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 

docs/news.html

@@ -5,6 +5,28 @@
 <p>
 
 <ul>
+
+  <li><b>30 May 2010 -- 2010.05 released</b>
+
+    <p>The stable 2010.05 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2010.05">CHANGES</a>
+    file for more details, and go to the <a href="/downloads/">downloads page</a>
+    to pick up the <a href="/downloads/buildroot-2010.05.tar.bz2">2010.05
+    release</a>.</p>
+
+  <li><b>27 May 2010 -- 2010.05-rc3 released</b>
+
+    <p>RC3 is out with more cleanups and bugfixes, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2010.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-2010.05-rc3.tar.bz2">2010.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>11 May 2010 -- 2010.05-rc2 released</b>
 
     <p>Another week, another release candidate with a bunch of

fs/common.mk

@@ -57,6 +57,9 @@ ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZMA),y)
 	$(LZMA) -9 -c $$@ > $$@.lzma
 endif
 
+$(1)-root-show-depends:
+	@echo $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
+
 $(1)-root: $(BINARIES_DIR)/rootfs.$(1)
 
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)

fs/squashfs/squashfs.mk

@@ -8,10 +8,18 @@ ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4),y)
 ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs
 else
 ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs3
+
+ifeq ($(BR2_ENDIAN),"BIG")
+ROOTFS_SQUASHF_ARGS=-be
+else
+ROOTFS_SQUASHFS_ARGS=-le
+endif
+
 endif
 
 define ROOTFS_SQUASHFS_CMD
-	$(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $$@ -noappend
+	$(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $$@ -noappend \
+		$(ROOTFS_SQUASHFS_ARGS)
 endef
 
-$(eval $(call ROOTFS_TARGET,squashfs))
+$(eval $(call ROOTFS_TARGET,squashfs))

package/Makefile.in

@@ -77,11 +77,6 @@ ifeq ($(BR2_LARGEFILE),y)
 TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif
 
-# Host packages are sometimes linked against host libraries installed
-# in $(HOST_DIR)/usr/lib. As we cannot add $(HOST_DIR)/usr/lib to
-# LD_LIBRARY_PATH when building target packages because it causes
-# libtool breakage, we force a rpath to be added to host binaries.
-HOST_CFLAGS+=-Wl,-rpath -Wl,$(HOST_DIR)/usr/lib
 
 #########################################################################
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)

package/Makefile.package.in

@@ -338,6 +338,9 @@ $(1)-extract:		$(1)-depends \
 
 $(1)-depends:		$(1)-source $$($(2)_DEPENDENCIES)
 
+$(1)-show-depends:
+			@echo $$($(2)_DEPENDENCIES)
+
 $(1)-source:		$$($(2)_TARGET_SOURCE)
 
 $(1)-uninstall:		$(1)-configure $$($(2)_TARGET_UNINSTALL)

package/atk/Config.in

@@ -1,5 +1,9 @@
 config BR2_PACKAGE_ATK
 	bool "atk"
 	select BR2_PACKAGE_LIBGLIB2
+	depends on BR2_USE_WCHAR # glib2
 	help
 	  The ATK accessibility toolkit, needed to build GTK+-2.x.
+
+comment "atk requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

package/avahi/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_AVAHI
 	bool "avahi"
-	select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Avahi is a system which facilitates service
 	  discovery on a local network.

package/avahi/avahi-optional-ipv6.patch

@@ -0,0 +1,147 @@
+[PATCH] avahi-core: make ipv6 support optional on uclibc 0.9.31+
+
+uClibc 0.9.31+ doesn't define the IPV6_* defines when IPv6 support isn't
+enabled, causing the avahi build to break. Detect this configuration, and
+comment out IPv6 code if so.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ avahi-core/socket.c |   28 +++++++++++++++++++++++-----
+ 1 file changed, 23 insertions(+), 5 deletions(-)
+
+Index: avahi-0.6.23/avahi-core/socket.c
+===================================================================
+--- avahi-0.6.23.orig/avahi-core/socket.c
++++ avahi-0.6.23/avahi-core/socket.c
+@@ -47,6 +47,11 @@
+ #include <net/if_dl.h>
+ #endif
+ 
++#include <features.h>
++#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
++#define NO_IPV6
++#endif
++
+ #include "dns.h"
+ #include "fdutil.h"
+ #include "socket.h"
+@@ -75,6 +80,7 @@ static void mdns_mcast_group_ipv4(struct
+     inet_pton(AF_INET, AVAHI_IPV4_MCAST_GROUP, &ret_sa->sin_addr);
+ }
+ 
++#ifndef NO_IPV6
+ static void mdns_mcast_group_ipv6(struct sockaddr_in6 *ret_sa) {
+     assert(ret_sa);
+ 
+@@ -83,6 +89,7 @@ static void mdns_mcast_group_ipv6(struct
+     ret_sa->sin6_port = htons(AVAHI_MDNS_PORT);
+     inet_pton(AF_INET6, AVAHI_IPV6_MCAST_GROUP, &ret_sa->sin6_addr);
+ }
++#endif
+ 
+ static void ipv4_address_to_sockaddr(struct sockaddr_in *ret_sa, const AvahiIPv4Address *a, uint16_t port) {
+     assert(ret_sa);
+@@ -95,6 +102,7 @@ static void ipv4_address_to_sockaddr(str
+     memcpy(&ret_sa->sin_addr, a, sizeof(AvahiIPv4Address));
+ }
+ 
++#ifndef NO_IPV6
+ static void ipv6_address_to_sockaddr(struct sockaddr_in6 *ret_sa, const AvahiIPv6Address *a, uint16_t port) {
+     assert(ret_sa);
+     assert(a);
+@@ -105,6 +113,7 @@ static void ipv6_address_to_sockaddr(str
+     ret_sa->sin6_port = htons(port);
+     memcpy(&ret_sa->sin6_addr, a, sizeof(AvahiIPv6Address));
+ }
++#endif
+ 
+ int avahi_mdns_mcast_join_ipv4(int fd, const AvahiIPv4Address *a, int idx, int join) {
+ #ifdef HAVE_STRUCT_IP_MREQN
+@@ -143,6 +152,7 @@ int avahi_mdns_mcast_join_ipv4(int fd, c
+ }
+ 
+ int avahi_mdns_mcast_join_ipv6(int fd, const AvahiIPv6Address *a, int idx, int join) {
++#ifndef NO_IPV6
+     struct ipv6_mreq mreq6;
+     struct sockaddr_in6 sa6;
+ 
+@@ -164,6 +174,9 @@ int avahi_mdns_mcast_join_ipv6(int fd, c
+     }
+ 
+     return 0;
++#else
++    return -1;
++#endif
+ }
+ 
+ static int reuseaddr(int fd) {
+@@ -372,6 +385,7 @@ fail:
+ }
+ 
+ int avahi_open_socket_ipv6(int no_reuse) {
++#ifndef NO_IPV6
+     struct sockaddr_in6 sa, local;
+     int fd = -1, yes, r;
+     int ttl;
+@@ -437,7 +451,7 @@ int avahi_open_socket_ipv6(int no_reuse)
+ fail:
+     if (fd >= 0)
+         close(fd);
+-
++#endif
+     return -1;
+ }
+ 
+@@ -567,7 +581,7 @@ int avahi_send_dns_packet_ipv6(
+         const AvahiIPv6Address *src_address,
+         const AvahiIPv6Address *dst_address,
+         uint16_t dst_port) {
+-
++#ifndef NO_IPV6
+     struct sockaddr_in6 sa;
+     struct msghdr msg;
+     struct iovec io;
+@@ -620,6 +634,9 @@ int avahi_send_dns_packet_ipv6(
+     }
+ 
+     return sendmsg_loop(fd, &msg, 0);
++#else
++    return -1;
++#endif
+ }
+ 
+ AvahiDnsPacket *avahi_recv_dns_packet_ipv4(
+@@ -782,7 +799,7 @@ AvahiDnsPacket *avahi_recv_dns_packet_ip
+         AvahiIPv6Address *ret_dst_address,
+         AvahiIfIndex *ret_iface,
+         uint8_t *ret_ttl) {
+-
++#ifndef NO_IPV6
+     AvahiDnsPacket *p = NULL;
+     struct msghdr msg;
+     struct iovec io;
+@@ -889,7 +906,7 @@ AvahiDnsPacket *avahi_recv_dns_packet_ip
+ fail:
+     if (p)
+         avahi_dns_packet_free(p);
+-
++#endif
+     return NULL;
+ }
+ 
+@@ -934,6 +951,7 @@ fail:
+ }
+ 
+ int avahi_open_unicast_socket_ipv6(void) {
++#ifndef NO_IPV6
+     struct sockaddr_in6 local;
+     int fd = -1, yes;
+ 
+@@ -974,6 +992,6 @@ int avahi_open_unicast_socket_ipv6(void)
+ fail:
+     if (fd >= 0)
+         close(fd);
+-
++#endif
+     return -1;
+ }

package/avahi/avahi.mk

@@ -82,7 +82,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \
 		--with-autoipd-user=default \
 		--with-autoipd-group=default
 
-AVAHI_DEPENDENCIES = $(if $(BR2_PACKAGE_GETTEXT),gettext) host-intltool
+AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-intltool
 
 ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
 AVAHI_DEPENDENCIES += libdaemon
@@ -144,6 +144,7 @@ ifeq ($(BR2_PACKAGE_AVAHI_AUTOIPD),y)
 	$(INSTALL) -D -m 0755 package/avahi/busybox-udhcpc-default.script $(TARGET_DIR)/usr/share/udhcpc/default.script
 	$(INSTALL) -m 0755 package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/
 	rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/var/lib
 	ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
 endif
 ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)

package/bmon/Config.in

@@ -1,5 +1,9 @@
 config BR2_PACKAGE_BMON
 	bool "bmon"
+	depends on BR2_INET_IPV6
 	select BR2_PACKAGE_NCURSES
 	help
 	  Linux bandwidth monitor
+
+comment "bmon requires a toolchain with IPv6 support"
+	depends on !BR2_INET_IPV6

package/busybox/busybox-1.16.1-dhcpd.patch

@@ -0,0 +1,12 @@
+diff -urpN busybox-1.16.1/networking/udhcp/leases.c busybox-1.16.1-dhcpd/networking/udhcp/leases.c
+--- busybox-1.16.1/networking/udhcp/leases.c	2010-03-28 19:43:36.000000000 +0200
++++ busybox-1.16.1-dhcpd/networking/udhcp/leases.c	2010-05-15 20:47:08.000000000 +0200
+@@ -64,6 +64,8 @@ struct dyn_lease* FAST_FUNC add_lease(
+ 		oldest->hostname[0] = '\0';
+ 		if (hostname) {
+ 			char *p;
++
++			hostname_len++; /* include NUL */
+ 			if (hostname_len > sizeof(oldest->hostname))
+ 				hostname_len = sizeof(oldest->hostname);
+ 			p = safe_strncpy(oldest->hostname, hostname, hostname_len);

package/busybox/busybox-1.16.1-sed.patch

@@ -1,7 +1,35 @@
 diff -urpN busybox-1.16.1/editors/sed.c busybox-1.16.1-sed/editors/sed.c
---- busybox-1.16.1/editors/sed.c	2010-03-28 13:43:35.000000000 -0400
-+++ busybox-1.16.1-sed/editors/sed.c	2010-04-20 13:33:26.301975462 -0400
-@@ -936,7 +936,15 @@ static void process_files(void)
+--- busybox-1.16.1/editors/sed.c	2010-03-28 19:43:35.000000000 +0200
++++ busybox-1.16.1-sed/editors/sed.c	2010-05-12 01:46:57.000000000 +0200
+@@ -487,7 +487,7 @@ static const char *parse_cmd_args(sed_cm
+ static void add_cmd(const char *cmdstr)
+ {
+ 	sed_cmd_t *sed_cmd;
+-	int temp;
++	unsigned len, n;
+ 
+ 	/* Append this line to any unfinished line from last time. */
+ 	if (G.add_cmd_line) {
+@@ -496,12 +496,14 @@ static void add_cmd(const char *cmdstr)
+ 		cmdstr = G.add_cmd_line = tp;
+ 	}
+ 
+-	/* If this line ends with backslash, request next line. */
+-	temp = strlen(cmdstr);
+-	if (temp && cmdstr[--temp] == '\\') {
++	/* If this line ends with unescaped backslash, request next line. */
++	n = len = strlen(cmdstr);
++	while (n && cmdstr[n-1] == '\\')
++		n--;
++	if ((len - n) & 1) { /* if odd number of trailing backslashes */
+ 		if (!G.add_cmd_line)
+ 			G.add_cmd_line = xstrdup(cmdstr);
+-		G.add_cmd_line[temp] = '\0';
++		G.add_cmd_line[len-1] = '\0';
+ 		return;
+ 	}
+ 
+@@ -936,7 +938,15 @@ static void process_files(void)
  		/* Skip blocks of commands we didn't match */
  		if (sed_cmd->cmd == '{') {
  			if (sed_cmd->invert ? matched : !matched) {
@@ -18,7 +46,7 @@ diff -urpN busybox-1.16.1/editors/sed.c busybox-1.16.1-sed/editors/sed.c
  					sed_cmd = sed_cmd->next;
  					if (!sed_cmd)
  						bb_error_msg_and_die("unterminated {");
-@@ -1031,7 +1039,7 @@ static void process_files(void)
+@@ -1031,7 +1041,7 @@ static void process_files(void)
  		case 'c':
  			/* Only triggers on last line of a matching range. */
  			if (!sed_cmd->in_match)
@@ -28,9 +56,9 @@ diff -urpN busybox-1.16.1/editors/sed.c busybox-1.16.1-sed/editors/sed.c
  
  		/* Read file, append contents to output */
 diff -urpN busybox-1.16.1/testsuite/sed.tests busybox-1.16.1-sed/testsuite/sed.tests
---- busybox-1.16.1/testsuite/sed.tests	2010-03-19 22:58:07.000000000 -0400
-+++ busybox-1.16.1-sed/testsuite/sed.tests	2010-04-20 13:33:26.301975462 -0400
-@@ -248,4 +248,14 @@ testing "sed beginning (^) matches only 
+--- busybox-1.16.1/testsuite/sed.tests	2010-03-20 03:58:07.000000000 +0100
++++ busybox-1.16.1-sed/testsuite/sed.tests	2010-05-12 01:46:57.000000000 +0200
+@@ -248,4 +248,28 @@ testing "sed beginning (^) matches only 
  	">/usr</>lib<\n" "" \
  	"/usr/lib\n"
  
@@ -43,5 +71,19 @@ diff -urpN busybox-1.16.1/testsuite/sed.tests busybox-1.16.1-sed/testsuite/sed.t
 +	"sed '/asd/ { p; /s/ { s/s/c/ }; p; q }'" \
 +	"qwe\nasd\nacd\nacd\n" "" \
 +	"qwe\nasd\nzxc\n"
++
++testing "sed a cmd ended by double backslash" \
++	"sed -e '/| one /a \\
++	| three \\\\' -e '/| one-/a \\
++	| three-* \\\\'" \
++'	| one \\
++	| three \\
++	| two \\
++' '' \
++'	| one \\
++	| two \\
++'
++
++# testing "description" "arguments" "result" "infile" "stdin"
 +
  exit $FAILCOUNT

package/cairo/Config.in

@@ -16,6 +16,7 @@ if BR2_PACKAGE_CAIRO
 config BR2_PACKAGE_CAIRO_PS
 	bool "postscript support"
 	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_CAIRO_PDF
 
 config BR2_PACKAGE_CAIRO_PDF
 	bool "pdf support"

package/cairo/cairo.mk

@@ -79,8 +79,6 @@ else
 	CAIRO_CONF_OPT += --disable-svg
 endif
 
-HOST_CAIRO_DEPENDENCIES = host-pkg-config host-pixman host-fontconfig
-
 HOST_CAIRO_CONF_OPT = \
 		--enable-ps \
 		--enable-pdf \
@@ -90,4 +88,3 @@ HOST_CAIRO_CONF_OPT = \
 		--disable-svg
 
 $(eval $(call AUTOTARGETS,package,cairo))
-$(eval $(call AUTOTARGETS,package,cairo,host))

package/cdrkit/Config.in

@@ -1,11 +1,15 @@
 config BR2_PACKAGE_CDRKIT
-       # Needed for libbz
-       select BR2_PACKAGE_BZIP2
-       select BR2_PACKAGE_LIBCAP
-       bool "cdrkit"
-       help
-         cdrkit is a suite of programs for recording CDs and DVDs,
-         blanking CD-RW media, creating ISO-9660 filesystem images,
-         extracting audio CD data, and more.
+	# Needed for libbz
+	select BR2_PACKAGE_BZIP2
+	select BR2_PACKAGE_LIBCAP
+	depends on BR2_LARGEFILE
+	bool "cdrkit"
+	help
+	  cdrkit is a suite of programs for recording CDs and DVDs,
+	  blanking CD-RW media, creating ISO-9660 filesystem images,
+	  extracting audio CD data, and more.
 
-	 http://www.cdrkit.org/
+	  http://www.cdrkit.org/
+
+comment "cdrkit requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE

package/config/Makefile.kconfig

@@ -149,10 +149,15 @@ ifeq ($(gconf-target),1)
 gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o
 endif
 
-clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck \
-		   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
-clean-files     += mconf qconf gconf
-clean-files     += config.pot linux.pot
+clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \
+               .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
+clean-files += config.pot linux.pot
+clean-files += conf $(conf-objs)
+clean-files += mconf $(mconf-objs)
+clean-files += qconf qconf.o
+clean-files += gconf gconf.o
+clean-files += kconfig_load.o zconf.tab.o
+clean-files += $(kxgettext-objs)
 
 # Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
 PHONY += $(obj)/dochecklxdialog

package/coreutils/coreutils.mk

@@ -12,7 +12,8 @@ COREUTILS_DIR:=$(BUILD_DIR)/coreutils-$(COREUTILS_VERSION)
 COREUTILS_BINARY:=src/vdir
 COREUTILS_TARGET_BINARY:=bin/vdir
 BIN_PROGS:=cat chgrp chmod chown cp date dd df dir echo false hostname \
-	ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true uname
+	ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \
+	uname join
 
 $(DL_DIR)/$(COREUTILS_SOURCE):
 	 $(call DOWNLOAD,$(COREUTILS_SITE),$(COREUTILS_SOURCE))

package/dbus-glib/Config.in

@@ -2,6 +2,7 @@ config BR2_PACKAGE_DBUS_GLIB
 	bool "dbus-glib"
 	depends on BR2_PACKAGE_DBUS
 	depends on BR2_DBUS_EXPAT
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  GLib bindings for D-Bus.
@@ -10,3 +11,6 @@ config BR2_PACKAGE_DBUS_GLIB
 
 comment "dbus-glib needs dbus to be compiled with expat support"
 	depends on BR2_PACKAGE_DBUS && !BR2_DBUS_EXPAT
+
+comment "dbus-glib requires a toolchain with WCHAR support"
+	depends on BR2_PACKAGE_DBUS && !BR2_USE_WCHAR

package/dbus-python/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_DBUS_PYTHON
 	bool "dbus-python"
+	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_PACKAGE_DBUS
 	depends on BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_DBUS_GLIB
@@ -7,3 +8,6 @@ config BR2_PACKAGE_DBUS_PYTHON
 	  Python bindings for D-Bus
 
 	  http://dbus.freedesktop.org/doc/dbus-python/
+
+comment "dbus-python requires a toolchain with WCHAR support"
+	depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON && !BR2_USE_WCHAR

package/docker/Config.in

@@ -1,8 +1,12 @@
 config BR2_PACKAGE_DOCKER
 	bool "docker"
 	depends on BR2_PACKAGE_XORG7
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  a system tray dock for X
 
 	  http://icculus.org/openbox/2/docker
+
+comment "docker requires a toolchain with WCHAR support"
+	depends on BR2_PACKAGE_XORG7 && !BR2_USE_WCHAR

package/enchant/Config.in

@@ -1,9 +1,13 @@
 config BR2_PACKAGE_ENCHANT
 	bool "enchant"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Enchant is a spell-checking library that provides a consistent
 	  API across a number of spell-checking system backends.
 
 	  http://www.abisource.com/projects/enchant/
+
+comment "enchant requires a toolchain with C++ and WCHAR support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR

package/fltk/fltk-1.1.7-bail-out-on-error.patch

@@ -0,0 +1,54 @@
+When a submake fails, the build of FLTK was stopping, but the main
+make was returning 0. Therefore, Buildroot was going on with the build
+of the other components, even though the build of FLTK failed.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: fltk-1.1.7/Makefile
+===================================================================
+--- fltk-1.1.7.orig/Makefile	2010-05-21 15:52:20.000000000 +0200
++++ fltk-1.1.7/Makefile	2010-05-21 15:52:43.000000000 +0200
+@@ -32,7 +32,7 @@
+ all: makeinclude
+ 	for dir in $(DIRS); do\
+ 		echo "=== making $$dir ===";\
+-		(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
++		(cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
+ 	done
+ 
+ install: makeinclude
+@@ -42,7 +42,7 @@
+ 	-chmod 755 $(DESTDIR)$(bindir)/fltk-config
+ 	for dir in FL $(DIRS); do\
+ 		echo "=== installing $$dir ===";\
+-		(cd $$dir; $(MAKE) $(MFLAGS) install) || break;\
++		(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
+ 	done
+ 
+ install-desktop: makeinclude
+@@ -54,7 +54,7 @@
+ 	$(RM) $(DESTDIR)$(bindir)/fltk-config
+ 	for dir in FL $(DIRS); do\
+ 		echo "=== uninstalling $$dir ===";\
+-		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || break;\
++		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || exit 1;\
+ 	done
+ 
+ uninstall-desktop: makeinclude
+@@ -65,14 +65,14 @@
+ depend: makeinclude
+ 	for dir in $(DIRS); do\
+ 		echo "=== making dependencies in $$dir ===";\
+-		(cd $$dir; $(MAKE) $(MFLAGS) depend) || break;\
++		(cd $$dir; $(MAKE) $(MFLAGS) depend) || exit 1;\
+ 	done
+ 
+ clean:
+ 	-$(RM) core *.o
+ 	for dir in $(DIRS); do\
+ 		echo "=== cleaning $$dir ===";\
+-		(cd $$dir; $(MAKE) $(MFLAGS) clean) || break;\
++		(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
+ 	done
+ 
+ distclean: clean

package/fltk/fltk-1.1.7-disable-test.patch

@@ -0,0 +1,17 @@
+Disable tests in FLTK because they use the fluid tool on the host.
+
+Patch borrowed from OpenEmbedded.
+
+Index: fltk-1.1.9/Makefile
+===================================================================
+--- fltk-1.1.9.orig/Makefile	2008-06-06 16:14:11.936736201 +0200
++++ fltk-1.1.9/Makefile	2008-06-06 16:14:22.526357637 +0200
+@@ -27,7 +27,7 @@
+ 
+ include makeinclude
+ 
+-DIRS	=	$(IMAGEDIRS) src fluid test documentation
++DIRS	=	$(IMAGEDIRS) src fluid documentation
+ 
+ all: makeinclude fltk-config
+ 	for dir in $(DIRS); do\

package/fltk/fltk-1.1.7-scandir-fix.patch

@@ -0,0 +1,20 @@
+Use the correct scandir() call.
+
+See http://www.fltk.org/str.php?L2205. This patch is a simplified
+version of http://www.fltk.org/strfiles/2205/scandir_posix.patch.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: fltk-1.1.7/src/filename_list.cxx
+===================================================================
+--- fltk-1.1.7.orig/src/filename_list.cxx	2010-05-21 15:58:09.000000000 +0200
++++ fltk-1.1.7/src/filename_list.cxx	2010-05-21 16:00:21.000000000 +0200
+@@ -54,7 +54,7 @@
+                      Fl_File_Sort_F *sort) {
+ #ifndef HAVE_SCANDIR
+   int n = scandir(d, list, 0, sort);
+-#elif defined(__hpux) || defined(__CYGWIN__)
++#elif defined(__hpux) || defined(__CYGWIN__) || defined(__USE_POSIX)
+   // HP-UX, Cygwin define the comparison function like this:
+   int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort);
+ #elif defined(__osf__)

package/fltk/fltk-1.1.7-tests.patch

@@ -1,11 +0,0 @@
---- a/test/Makefile	2006-01-15 13:36:16.000000000 -0500
-+++ b/test/Makefile	2008-02-12 13:34:25.000000000 -0500
-@@ -230,7 +230,7 @@ uninstall-osx:
- # FLUID file rules
- .fl.cxx .fl.h:	../fluid/fluid$(EXEEXT)
- 	echo Generating $<...
--	../fluid/fluid$(EXEEXT) -c $<
-+	/usr/bin/fluid$(EXEEXT) -c $<
- 
- # All demos depend on the FLTK library...
- $(ALL): ../lib/$(LIBNAME)

package/gamin/Config.in

@@ -1,7 +1,11 @@
 config BR2_PACKAGE_GAMIN
 	bool "gamin"
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  the File Alteration Monitor
 
 	  http://www.gnome.org/~veillard/gamin/sources
+
+comment "gamin requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

package/gettext/Config.in

@@ -1,5 +1,7 @@
 config BR2_PACKAGE_GETTEXT
 	bool "gettext"
+	depends on BR2_NEEDS_GETTEXT
+	depends on BR2_USE_WCHAR
 	help
 	  The GNU `gettext' utilities are a set of tools that provide a
 	  framework to help other GNU packages produce multi-lingual
@@ -7,6 +9,9 @@ config BR2_PACKAGE_GETTEXT
 
 	  http://www.gnu.org/software/gettext/
 
+comment "gettext requires a toolchain with WCHAR support"
+	depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR
+
 config BR2_PACKAGE_GETTEXT_STATIC
 	bool "Use libgettext.a instead of libgettext.so.*"
 	depends on BR2_PACKAGE_GETTEXT
@@ -21,6 +26,7 @@ config BR2_PACKAGE_GETTEXT_STATIC
 
 config BR2_PACKAGE_LIBINTL
 	bool "libintl"
+	depends on BR2_NEEDS_GETTEXT
 	help
 	  Selecting this package installs all of gettext in the staging
 	  directory and the shared library for it's use in the target.

package/gmpc/Config.in

@@ -1,9 +1,10 @@
 config BR2_PACKAGE_GMPC
 	bool "gmpc"
 	depends on BR2_PACKAGE_LIBGTK2
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_GETTEXT
-	select BR2_PACKAGE_LIBINTL
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBMPD
 	select BR2_PACKAGE_LIBCURL
@@ -14,3 +15,6 @@ config BR2_PACKAGE_GMPC
 	  Music Player Daemon.
 
 	  http://gmpcwiki.sarine.nl/index.php?title=GMPC
+
+comment "gmpc requires a toolchain with WCHAR support"
+	depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR

package/gmpc/gmpc.mk

@@ -11,7 +11,8 @@ GMPC_CONF_ENV = ac_cv_lib_curl_curl_global_init=yes \
 		ac_cv_path_GOB2=$(GOB2_HOST_BINARY)
 GMPC_CONF_OPT = --disable-mmkeys
 
-GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd host-gob2 host-intltool
+GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd host-gob2 host-intltool \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y)
 GMPC_DEPENENCIES += xlib_libSM

package/gob2/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_GOB2
 	bool "gob2"
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_FLEX
 	select BR2_PACKAGE_FLEX_LIBFL
@@ -9,3 +10,6 @@ config BR2_PACKAGE_GOB2
 	  the writing of GObjects in C.
 
 	  http://www.jirka.org/gob.html
+
+comment "gob2 requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

package/gob2/gob2.mk

@@ -6,6 +6,7 @@
 GOB2_VERSION = 2.0.15
 GOB2_SOURCE = gob2-$(GOB2_VERSION).tar.gz
 GOB2_SITE = http://ftp.5z.com/pub/gob/
+IPERF_CONF_ENV = ac_cv_lib_lex=-lfl
 
 GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config host-flex
 

package/grep/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_GREP
 	bool "grep"
-	select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  The GNU regular expression matcher.
 

package/grep/grep.mk

@@ -8,6 +8,6 @@ GREP_SOURCE:=grep-$(GREP_VERSION).tar.bz2
 GREP_SITE:=$(BR2_GNU_MIRROR)/grep
 GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
 
-GREP_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),gettext libintl)
+GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
 $(eval $(call AUTOTARGETS,package,grep))

package/gvfs/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_GVFS
 	bool "gvfs"
 	depends on BR2_LARGEFILE
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_EXPAT # needed by dbus(-glib)
 	select BR2_PACKAGE_DBUS
@@ -15,5 +16,5 @@ config BR2_PACKAGE_GVFS
 
 	  http://en.wikipedia.org/wiki/GVFS
 
-comment "gvfs requires a toolchain with LARGEFILE support"
-	depends on !BR2_LARGEFILE
+comment "gvfs requires a toolchain with LARGEFILE and WCHAR support"
+	depends on !BR2_LARGEFILE || !BR2_USE_WCHAR

package/hal/Config.in

@@ -1,15 +1,19 @@
 config BR2_PACKAGE_HAL
 	bool "hal"
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_GETTEXT
-	select BR2_PACKAGE_LIBINTL
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_DBUS
-	select BR2_PACKAGE_DBUS_EXPAT
+	select BR2_DBUS_EXPAT
 	select BR2_PACKAGE_DBUS_GLIB
 	select BR2_PACKAGE_HWDATA
 	select BR2_PACKAGE_UDEV
 	select BR2_PACKAGE_UDEV_VOLUME_ID
 	help
 	  The Hardware Abstraction Layer (HAL) suite.
+
+comment "hal requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

package/hal/hal.mk

@@ -79,7 +79,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
 		rm -f $(TARGET_DIR)/usr/libexec/$$file; \
 	done
 
-hal: host-pkg-config host-libxml-parser-perl dbus-glib hwdata udev $(TARGET_DIR)/$(HAL_TARGET_BINARY)
+hal: host-pkg-config host-libxml-parser-perl dbus-glib hwdata udev $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) $(TARGET_DIR)/$(HAL_TARGET_BINARY)
 
 hal-clean:
 	rm -f $(TARGET_DIR)/etc/dbus-1/system.d/hal.conf

package/icu/icu-both-elif-no-arguments.patch

@@ -0,0 +1,23 @@
+[PATCH] icu: fix #elif without arguments
+
+ParagraphLayout.cpp contains an #elif without any arguments, which
+g++ >= 4.4 flags as an error. Fix it by replacing it with an #else.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ source/layoutex/ParagraphLayout.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: source/layoutex/ParagraphLayout.cpp
+===================================================================
+--- source.orig/layoutex/ParagraphLayout.cpp
++++ source/layoutex/ParagraphLayout.cpp
+@@ -813,7 +813,7 @@ le_int32 ParagraphLayout::getLanguageCod
+ 
+     return nullLanguageCode;
+ }
+-#elif
++#else
+ 
+ // TODO - dummy implementation for right now...
+ le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)

package/icu/icu.mk

@@ -21,6 +21,7 @@ $(ICU_DIR)/.unpacked: $(DL_DIR)/$(ICU_SOURCE)
 	$(CONFIG_UPDATE) $(ICU_DIR)
 	cp -a $(BUILD_DIR)/icu $(BUILD_DIR)/icu-host
 	toolchain/patch-kernel.sh $(ICU_DIR) package/icu/ \*.patch
+	toolchain/patch-kernel.sh $(ICU_HOST_DIR) package/icu/ \*both\*.patch
 	touch $(ICU_DIR)/.unpacked
 
 $(ICU_HOST_DIR)/.configured: $(ICU_DIR)/.unpacked
@@ -45,13 +46,13 @@ $(ICU_DIR)/.configured: $(ICU_HOST_DIR)/.configured
 	touch $(ICU_DIR)/.configured
 
 $(ICU_HOST_DIR)/.done: $(ICU_DIR)/.configured
-	$(MAKE) -C $(ICU_HOST_DIR)
+	$(MAKE1) -C $(ICU_HOST_DIR)
 	ln -s -f $(ICU_HOST_DIR)/bin $(ICU_DIR)/bin-host
 	ln -s -f $(ICU_HOST_DIR)/lib $(ICU_DIR)/lib-host
 	touch $(ICU_HOST_DIR)/.done
 
 $(ICU_DIR)/.done: $(ICU_HOST_DIR)/.done
-	$(MAKE) -C $(ICU_DIR)
+	$(MAKE1) -C $(ICU_DIR)
 	$(MAKE) -C $(ICU_DIR) install DESTDIR=$(STAGING_DIR)
 	$(MAKE) -C $(ICU_DIR) install DESTDIR=$(TARGET_DIR)
 	$(SED) "s,^default_prefix=.*,default_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/icu-config

package/iperf/iperf.mk

@@ -14,7 +14,9 @@ IPERF_INSTALL_STAGING = NO
 IPERF_INSTALL_TARGET = YES
 
 IPERF_CONF_ENV = \
-	ac_cv_func_malloc_0_nonnull=yes
+	ac_cv_func_malloc_0_nonnull=yes \
+	ac_cv_type_bool=yes \
+	ac_cv_sizeof_bool=1
 
 IPERF_CONF_OPT = \
 	--disable-dependency-tracking \

package/libcap/libcap-2.19-build-system.patch

@@ -1,13 +1,19 @@
----
- Make.Rules      |   15 ++++++++-------
- libcap/Makefile |    2 +-
- 2 files changed, 9 insertions(+), 8 deletions(-)
-
-Index: libcap-2.19/Make.Rules
-===================================================================
---- libcap-2.19.orig/Make.Rules
-+++ libcap-2.19/Make.Rules
-@@ -45,24 +45,25 @@
+diff -Nura libcap-2.19.orig/libcap/Makefile libcap-2.19/libcap/Makefile
+--- libcap-2.19.orig/libcap/Makefile	2008-12-04 05:03:12.000000000 -0200
++++ libcap-2.19/libcap/Makefile	2010-05-28 14:32:06.290297694 -0300
+@@ -33,7 +33,7 @@
+ endif
+ 
+ _makenames: _makenames.c cap_names.list.h
+-	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
++	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
+ 
+ cap_names.h: _makenames
+ 	./_makenames > cap_names.h
+diff -Nura libcap-2.19.orig/Make.Rules libcap-2.19/Make.Rules
+--- libcap-2.19.orig/Make.Rules	2010-01-13 23:04:58.000000000 -0300
++++ libcap-2.19/Make.Rules	2010-05-28 14:32:31.802296186 -0300
+@@ -45,25 +45,26 @@
  KERNEL_HEADERS := $(topdir)/libcap/include
  IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
  
@@ -36,20 +42,9 @@ Index: libcap-2.19/Make.Rules
  INCS=$(topdir)/libcap/include/sys/capability.h
  LDFLAGS += -L$(topdir)/libcap
  CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH)
+-PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
 +CFLAGS_FOR_BUILD += $(IPATH)
- PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
++PAM_CAP := no
  INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
  DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
-Index: libcap-2.19/libcap/Makefile
-===================================================================
---- libcap-2.19.orig/libcap/Makefile
-+++ libcap-2.19/libcap/Makefile
-@@ -33,7 +33,7 @@
- endif
- 
- _makenames: _makenames.c cap_names.list.h
--	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
- 
- cap_names.h: _makenames
- 	./_makenames > cap_names.h
+ LIBATTR := yes

package/libcap/libcap.mk

@@ -8,7 +8,7 @@ define LIBCAP_BUILD_CMDS
 endef
 
 define LIBCAP_INSTALL_STAGING_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(STAGING_DIR) install
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib install
 endef
 
 define LIBCAP_INSTALL_TARGET_CMDS
@@ -20,7 +20,7 @@ define HOST_LIBCAP_BUILD_CMDS
 endef
 
 define HOST_LIBCAP_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(HOST_DIR) install
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(HOST_DIR) prefix=/usr lib=lib install
 endef
 
 $(eval $(call GENTARGETS,package,libcap))

package/libcgicc/libcgicc.mk

@@ -7,6 +7,8 @@ LIBCGICC_VERSION=3.2.9
 LIBCGICC_SITE=$(BR2_GNU_MIRROR)/cgicc
 LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.gz
 LIBCGICC_INSTALL_STAGING=YES
+LIBCGICC_LIBTOOL_PATCH=NO
+LIBCGICC_AUTORECONF=YES
 
 LIBCGICC_CONF_OPT = \
 	--disable-demos \

package/libglade/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBGLADE
 	bool "libglade"
 	depends on BR2_PACKAGE_LIBGTK2
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_ATK
 	select BR2_PACKAGE_LIBXML2
@@ -10,3 +11,6 @@ config BR2_PACKAGE_LIBGLADE
 	  by far the easiest way to create the interface files.
 
 	  http://ftp.gnome.org/pub/GNOME/sources/libglade/
+
+comment "libglade requires a toolchain with WCHAR support"
+	depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR

package/libglib2/Config.in

@@ -1,9 +1,13 @@
 config BR2_PACKAGE_LIBGLIB2
 	bool "libglib2"
-	select BR2_PACKAGE_GETTEXT
-	select BR2_PACKAGE_LIBINTL
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	depends on BR2_USE_WCHAR # gettext
 	help
 	  Low-level core library that forms the basis of GTK+ and GNOME.
 
 	  http://www.gtk.org/
+
+comment "libglib2 requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

package/libglib2/libglib2.mk

@@ -55,7 +55,7 @@ HOST_LIBGLIB2_CONF_OPT = \
 		--disable-gtk-doc \
 		--enable-debug=no \
 
-LIBGLIB2_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2
+LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 $(if $(BR2_NEEDS_GETTEXT),gettext libintl)
 
 HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config
 

package/libgtk2/Config.in

@@ -7,7 +7,11 @@ config BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_PANGO
 	depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB
+	depends on BR2_USE_WCHAR # glib2
 	help
 	  The GTK+ version 2 graphical user interface library
 
 	  http://www.gtk.org/
+
+comment "libgtk2 requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

package/libiconv/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBICONV
 	bool "libiconv"
+	depends on !BR2_ENABLE_LOCALE
 	help
 	  unicode conversion library
 

package/libidn/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBIDN
 	bool "libidn"
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Libidn's purpose is to encode and decode internationalized 
 	  domain names. 

package/libidn/libidn.mk

@@ -10,7 +10,7 @@ LIBIDN_INSTALL_STAGING = YES
 LIBIDN_INSTALL_TARGET = YES
 LIBIDN_CONF_OPT = --enable-shared --disable-java --enable-csharp=no
 LIBIDN_LIBTOOL_PATCH = NO
-LIBIDN_DEPENDENCIES = host-pkg-config gettext $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+LIBIDN_DEPENDENCIES = host-pkg-config $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 $(eval $(call AUTOTARGETS,package,libidn))
 

package/libsoup/Config.in

@@ -1,10 +1,16 @@
 config BR2_PACKAGE_LIBSOUP
 	bool "libsoup"
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
 	help
 	  libsoup is an HTTP client/server library. It uses GObject
 	  and the GLib main loop, to integrate well with GNOME
 	  applications.
 
 	  http://live.gnome.org/LibSoup
+
+comment "libsoup requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

package/libsoup/libsoup.mk

@@ -26,6 +26,6 @@ LIBSOUP_CONF_OPT = \
 	--without-gnome		\
 	--disable-gtk-doc
 
-LIBSOUP_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2 libglib2 libxml2
+LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2
 
 $(eval $(call AUTOTARGETS,package,libsoup))

package/lmbench/Config.in

@@ -1,7 +1,12 @@
 config BR2_PACKAGE_LMBENCH
 	bool "lmbench"
+	# Uses pmap_set, pmap__unset, pmap_getport, etc.
+	depends on BR2_INET_RPC
 	help
 	  LMbench is a suite of simple, portable,
 	  ANSI/C microbenchmarks for UNIX/POSIX.
 
 	  http://sourceforge.net/projects/lmbench/
+
+comment "lmbench requires a toolchain with RPC support"
+	depends on !BR2_INET_RPC

package/lockfile-progs/lockfile-progs.mk

@@ -21,7 +21,7 @@ $(LOCKFILE_PROGS_DIR)/.unpacked: $(DL_DIR)/$(LOCKFILE_PROGS_SOURCE)
 	touch $(LOCKFILE_PROGS_DIR)/.unpacked
 
 $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY): $(LOCKFILE_PROGS_DIR)/.unpacked
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" \
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(TARGET_CONFIGURE_ENV) \
 		-C $(LOCKFILE_PROGS_DIR)
 	cp -a $(LOCKFILE_PROGS_DIR)/bin/lockfile* $(TARGET_DIR)/usr/bin
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY)

package/lsof/Config.in

@@ -1,8 +1,12 @@
 config BR2_PACKAGE_LSOF
 	bool "lsof"
+	depends on BR2_INET_RPC
 	help
 	  lsof (LiSt Open Files)
 	  The lsof tool lists information about files opened by
 	  processes.
 
 	  ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
+
+comment "lsof requires a toolchain with RPC support"
+	depends on !BR2_INET_RPC

package/ltrace/ltrace.mk

@@ -54,8 +54,7 @@ $(LTRACE_DIR)/.configured: $(LTRACE_DIR)/.patched
 	touch $@
 
 $(LTRACE_DIR)/$(LTRACE_BINARY): $(LTRACE_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(LTRACE_ARCH) \
-		-C $(LTRACE_DIR)
+	$(MAKE) ARCH=$(LTRACE_ARCH) -C $(LTRACE_DIR)
 
 $(TARGET_DIR)/$(LTRACE_TARGET_BINARY): $(LTRACE_DIR)/$(LTRACE_BINARY)
 	#$(MAKE) DESTDIR=$(TARGET_DIR) ARCH=$(LTRACE_ARCH)  -C $(LTRACE_DIR) install

package/lvm2/lvm2.mk

@@ -74,7 +74,7 @@ $(LVM2_DIR)/.configured: $(LVM2_DIR)/.unpacked
 
 
 $(LVM2_DIR)/.built: $(LVM2_DIR)/.configured
-	$(MAKE1) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) -C $(LVM2_DIR) DESTDIR=$(STAGING_DIR)
+	$(MAKE1) -C $(LVM2_DIR) DESTDIR=$(STAGING_DIR)
 	$(MAKE1) -C $(LVM2_DIR) DESTDIR=$(STAGING_DIR) install
 	# Fixup write permissions so that the files can be overwritten
 	# several times in the $(TARGET_DIR)

package/make/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MAKE
 	bool "make"
-	select BR2_PACKAGE_GETTEXT if BR2_ENABLE_LOCALE
-	select BR2_PACKAGE_LIBINTL if BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  A tool which controls the generation of executables and other
 	  non-source files of a program from the program's source files.

package/make/make.mk

@@ -56,7 +56,7 @@ $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY): $(GNUMAKE_DIR)/$(GNUMAKE_BINARY)
 	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 
-make: $(if $(BR2_PACKAGE_GETTEXT),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
+make: $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY)
 
 make-clean:
 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUMAKE_DIR) uninstall

package/metacity/Config.in

@@ -1,6 +1,6 @@
 config BR2_PACKAGE_METACITY
 	bool "metacity"
-	select BR2_PACKAGE_LIBGTK2
+	depends on BR2_PACKAGE_LIBGTK2
 	depends on BR2_PACKAGE_XORG7
 	help
 	  Metacity is a window manager for the X Window System.

package/microperl/microperl.mk

@@ -22,6 +22,11 @@ $(DL_DIR)/$(MICROPERL_SOURCE):
 
 $(MICROPERL_DIR)/.source: $(DL_DIR)/$(MICROPERL_SOURCE)
 	$(MICROPERL_CAT) $(DL_DIR)/$(MICROPERL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	# makedepend contains bashisms
+	$(SED) 's~sh ./makedepend~bash ./makedepend~' \
+		$(MICROPERL_DIR)/Makefile.SH \
+		$(MICROPERL_DIR)/x2p/Makefile.SH \
+		$(MICROPERL_DIR)/pod/Makefile.SH
 	chmod -R u+w $(MICROPERL_DIR)
 	touch $@
 

package/mtd/Config.in

@@ -79,8 +79,12 @@ config BR2_PACKAGE_MTD_NFTL_FORMAT
 	bool "nftl_format"
 
 config BR2_PACKAGE_MTD_RECV_IMAGE
+	depends on BR2_INET_IPV6
 	bool "recv_image"
 
+comment "recv_image requires a toolchain with IPv6 support"
+	depends on !BR2_INET_IPV6
+
 config BR2_PACKAGE_MTD_RFDDUMP
 	bool "rfddump"
 

package/mtd/mtd.mk

@@ -14,12 +14,12 @@ HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-e2fsprogs
 
 define HOST_MTD_BUILD_CMDS
 	CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
-		CROSS= $(MAKE) BUILDDIR=$(@D) \
+		CROSS= $(MAKE1) BUILDDIR=$(@D) \
 		WITHOUT_XATTR=1 -C $(@D)
 endef
 
 define HOST_MTD_INSTALL_CMDS
-	$(MAKE) BUILDDIR=$(@D) DESTDIR=$(HOST_DIR) -C $(@D) install
+	$(MAKE1) BUILDDIR=$(@D) DESTDIR=$(HOST_DIR) -C $(@D) install
 endef
 
 MKFS_JFFS2=$(HOST_DIR)/usr/sbin/mkfs.jffs2
@@ -71,7 +71,7 @@ MTD_MAKE_COMMON_FLAGS = \
 
 ifneq ($(MTD_TARGETS_y),)
 define MTD_TARGETS_BUILD
-	$(MAKE) $(MTD_MAKE_COMMON_FLAGS) \
+	$(MAKE1) $(MTD_MAKE_COMMON_FLAGS) \
 		BUILDDIR=$(@D) \
 		-C $(@D) \
 		$(addprefix $(@D)/, $(MTD_TARGETS_y))
@@ -80,7 +80,7 @@ endif
 
 ifneq ($(MTD_TARGETS_UBI_y),)
 define MTD_TARGETS_UBI_BUILD
-	$(MAKE) $(MTD_MAKE_COMMON_FLAGS) \
+	$(MAKE1) $(MTD_MAKE_COMMON_FLAGS) \
 		BUILDDIR=$(@D)/ubi-utils/ \
 		-C $(@D)/ubi-utils \
 		$(addprefix $(@D)/ubi-utils/, $(MTD_TARGETS_UBI_y))

package/multimedia/aumix/aumix.mk

@@ -6,7 +6,7 @@
 
 AUMIX_VERSION=2.8
 AUMIX_SOURCE=aumix-$(AUMIX_VERSION).tar.bz2
-AUMIX_SITE=http://jpj.net/~trevor/aumix
+AUMIX_SITE=http://jpj.net/~trevor/aumix/releases
 AUMIX_AUTORECONF=YES
 
 AUMIX_CONF_OPT = \

package/multimedia/gst-plugins-bad/Config.in

@@ -58,7 +58,11 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDNAV
 	bool "dvdnav"
-        select BR2_PACKAGE_LIBDVDNAV
+	depends on BR2_LARGEFILE # libdvdread
+	select BR2_PACKAGE_LIBDVDNAV
+
+comment "dvdnav requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU
 	bool "dvdspu"

package/multimedia/gst-plugins-base/gst-plugins-base.mk

@@ -23,7 +23,8 @@ GST_PLUGINS_BASE_CONF_OPT = \
 		--disable-vorbistest \
 		--disable-freetypetest
 
-GST_PLUGINS_BASE_DEPENDENCIES = gstreamer liboil
+GST_PLUGINS_BASE_DEPENDENCIES = gstreamer liboil \
+		$(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib)
 
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER),y)
 GST_PLUGINS_BASE_CONF_OPT += --enable-adder

package/multimedia/gstreamer/Config.in

@@ -1,11 +1,15 @@
 config BR2_PACKAGE_GSTREAMER
 	bool "gstreamer"
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  GStreamer is an open source multimedia framework.
 
 	  http://gstreamer.freedesktop.org/
 
+comment "gstreamer requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
+
 config BR2_PACKAGE_GSTREAMER_LIBXML2
 	bool "require libxml2 for registry and load/save"
 	default y

package/multimedia/libdvdnav/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBDVDNAV
 	bool "libdvdnav"
+	depends on BR2_LARGEFILE # libdvdread
         select BR2_PACKAGE_LIBDVDREAD
 	help
 	  libdvdnav is a library that allows easy use of sophisticated
@@ -7,3 +8,6 @@ config BR2_PACKAGE_LIBDVDNAV
 	  playback and even interactive DVD games.
 
 	  http://www.mplayerhq.hu
+
+comment "libdvdnav requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE

package/multimedia/libdvdread/Config.in

@@ -1,7 +1,11 @@
 config BR2_PACKAGE_LIBDVDREAD
 	bool "libdvdread"
+	depends on BR2_LARGEFILE
 	help
 	  libdvdread provides a simple foundation for reading
 	  DVD-Video images.
 
 	  http://www.mplayerhq.hu/MPlayer/releases/dvdnav/
+
+comment "libdvdread requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE

package/multimedia/libmms/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBMMS
 	bool "libmms"
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
           LibMMS is a common library for parsing mms:// and mmsh://
@@ -9,3 +10,6 @@ config BR2_PACKAGE_LIBMMS
           all.
 
 	  http://launchpad.net/libmms
+
+comment "libmms requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

package/multimedia/libmpd/Config.in

@@ -1,8 +1,7 @@
 config BR2_PACKAGE_LIBMPD
 	bool "libmpd"
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_GETTEXT
-	select BR2_PACKAGE_LIBINTL
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  High-level client library for accessing Music Player Daemon.
@@ -10,3 +9,6 @@ config BR2_PACKAGE_LIBMPD
 	  access to Music Player Daemon (mpd).
 
 	  http://gmpcwiki.sarine.nl/index.php?title=Libmpd
+
+comment "libmpd requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

package/multimedia/swfdec/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SWFDEC
 	bool "swfdec"
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBOIL
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_PANGO
@@ -15,6 +16,7 @@ config BR2_PACKAGE_SWFDEC_GTK_SUPPORT
 	depends on BR2_PACKAGE_SWFDEC
 	depends on BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_LIBSOUP
+	default y
 	help
 	  Swfdec-gtk library is used for easy integration
 	  of swfdec in GTK applications
@@ -22,8 +24,11 @@ config BR2_PACKAGE_SWFDEC_GTK_SUPPORT
 config BR2_PACKAGE_SWFDEC_GSTREAMER
 	bool "gstreamer support"
 	depends on BR2_PACKAGE_SWFDEC
-	select BR2_PACKAGE_GSTREAMER
+	depends on BR2_PACKAGE_GSTREAMER
 	select BR2_PACKAGE_GST_PLUGINS_BASE
+	default y
 	help
 	  Enables GStreamer support
 
+comment "swfdec requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

package/mutt/Config.in

@@ -1,8 +1,11 @@
 config BR2_PACKAGE_MUTT
-	bool "mutt (BROKEN for wchar; FIXME!)"
+	bool "mutt"
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_NCURSES
 	help
 	  Mutt is a sophisticated text-based Mail User Agent (MUA)
 
 	  http://www.mutt.org/
 
+comment "mutt requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

package/mutt/mutt-1.5.16-makedoc-hostcc.patch

@@ -1,32 +0,0 @@
---- mutt-1.5.16.oorig/Makefile.in	2007-09-02 22:16:23.000000000 +0200
-+++ mutt-1.5.16/Makefile.in	2007-09-02 22:19:49.000000000 +0200
-@@ -164,12 +164,6 @@
- DBX = @DBX@
- DEBUGGER = @DEBUGGER@
- 
--# $(makedoc_OBJECTS): $(makedoc_SOURCES)
--# 	$(HOST_CC) $(DEFS) $(AM_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $<
--
--# makedoc: $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
--# 	@rm -rf makedoc
--# 	$(HOST_CC) $(AM_CFLAGS) $(LDFLAGS) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) -o makedoc
- DEFS = -DPKGDATADIR=\"$(pkgdatadir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
- 	-DBINDIR=\"$(bindir)\" -DMUTTLOCALEDIR=\"$(datadir)/locale\" \
- 	-DHAVE_CONFIG_H=1
-@@ -447,9 +441,15 @@
- 
- clean-binPROGRAMS:
- 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-+
-+$(makedoc_OBJECTS): $(makedoc_SOURCES)
-+	$(CC_FOR_BUILD) -DHAVE_UNISTD_H -DHAVE_GETOPT_H -DHAVE_STRERROR -c $< ;#$(DEFS) $(AM_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $<
-+#makedoc: $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
-+#	@rm -rf makedoc
-+#	$(CC_FOR_BUILD) $(AM_CFLAGS) $(LDFLAGS) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) -o makedoc
- makedoc$(EXEEXT): $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES) 
- 	@rm -f makedoc$(EXEEXT)
--	$(LINK) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) $(LIBS)
-+	$(CC_FOR_BUILD) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) $(LIBS) -o $@
- mutt$(EXEEXT): $(mutt_OBJECTS) $(mutt_DEPENDENCIES) 
- 	@rm -f mutt$(EXEEXT)
- 	$(LINK) $(mutt_LDFLAGS) $(mutt_OBJECTS) $(mutt_LDADD) $(LIBS)

package/mutt/mutt-1.5.17+20080114-nodoc.patch

@@ -0,0 +1,21 @@
+Disable the documentation build
+
+The documentation tool is compiled for the target, but executed on the
+host. We don't bother fixing this, as we don't care of the
+documentation in Buildroot.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: mutt-1.5.17+20080114/Makefile.am
+===================================================================
+--- mutt-1.5.17+20080114.orig/Makefile.am	2010-05-15 18:15:08.000000000 +0200
++++ mutt-1.5.17+20080114/Makefile.am	2010-05-15 18:15:17.000000000 +0200
+@@ -9,7 +9,7 @@
+ IMAP_INCLUDES = -I$(top_srcdir)/imap
+ endif
+ 
+-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
++SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR)
+ 
+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+ 

package/mutt/mutt.mk

@@ -7,70 +7,19 @@ MUTT_VERSION:=1.5.17+20080114
 MUTT_SOURCE:=mutt_$(MUTT_VERSION).orig.tar.gz
 MUTT_PATCH:=mutt_$(MUTT_VERSION)-1.diff.gz
 MUTT_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mutt/
-MUTT_DIR:=$(BUILD_DIR)/mutt-$(MUTT_VERSION)
-MUTT_CAT:=$(ZCAT)
-MUTT_BINARY:=mutt
-MUTT_TARGET_BINARY:=usr/bin/mutt
-
-$(DL_DIR)/$(MUTT_SOURCE):
-	$(call DOWNLOAD,$(MUTT_SITE),$(MUTT_SOURCE))
-
-$(DL_DIR)/$(MUTT_PATCH):
-	$(call DOWNLOAD,$(MUTT_SITE),$(MUTT_PATCH))
-
-$(MUTT_DIR)/.unpacked: $(DL_DIR)/$(MUTT_SOURCE) $(DL_DIR)/$(MUTT_PATCH)
-	$(MUTT_CAT) $(DL_DIR)/$(MUTT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(MUTT_DIR) package/mutt/ mutt-$(MUTT_VERSION)\*.patch
-ifneq ($(MUTT_PATCH),)
-	(cd $(MUTT_DIR) && $(MUTT_CAT) $(DL_DIR)/$(MUTT_PATCH) | patch -p1)
-	if [ -d $(MUTT_DIR)/debian/patches ]; then \
-		toolchain/patch-kernel.sh $(MUTT_DIR) $(MUTT_DIR)/debian/patches \*.patch; \
-	fi
-endif
-	touch $@
-
-$(MUTT_DIR)/.configured: $(MUTT_DIR)/.unpacked
-	(cd $(MUTT_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		$(DISABLE_LARGEFILE) \
-		$(DISABLE_IPV6) \
-		$(DISABLE_NLS) \
+MUTT_DEPENDENCIES=ncurses
+MUTT_CONF_OPT = \
 		--disable-smtp \
 		--disable-iconv \
-		--without-wc-funcs \
-	)
-	touch $@
+		--without-wc-funcs
+MUTT_AUTORECONF=YES
 
-$(MUTT_DIR)/$(MUTT_BINARY): $(MUTT_DIR)/.configured
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(MUTT_DIR)
+define MUTT_APPLY_DEBIAN_PATCHES
+        if [ -d $(@D)/debian/patches ]; then \
+                toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \
+        fi
+endef
 
-$(TARGET_DIR)/$(MUTT_TARGET_BINARY): $(MUTT_DIR)/$(MUTT_BINARY)
-	cp -dpf $(MUTT_DIR)/$(MUTT_BINARY) $@
-	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
+MUTT_POST_PATCH_HOOKS += MUTT_APPLY_DEBIAN_PATCHES
 
-mutt-source: $(DL_DIR)/$(MUTT_SOURCE) $(DL_DIR)/$(MUTT_PATCH)
-
-mutt-unpacked: $(MUTT_DIR)/.unpacked
-
-mutt: ncurses $(TARGET_DIR)/$(MUTT_TARGET_BINARY)
-
-mutt-clean:
-	-$(MAKE) -C $(MUTT_DIR) clean
-	rm -f $(TARGET_DIR)/$(MUTT_TARGET_BINARY)
-
-mutt-dirclean:
-	rm -rf $(MUTT_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_MUTT),y)
-TARGETS+=mutt
-endif
+$(eval $(call AUTOTARGETS,package,mutt))

package/nbd/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NBD
 	bool "nbd"
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  NBD is a set of utilities to configure network block devices,
@@ -9,6 +10,9 @@ config BR2_PACKAGE_NBD
 
 	  http://nbd.sf.net/
 
+comment "nbd requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
+
 if BR2_PACKAGE_NBD
 
 config BR2_NBD_CLIENT

package/ncftp/ncftp.mk

@@ -3,7 +3,7 @@
 # ncftp client
 #
 #############################################################
-NCFTP_VERSION:=3.2.2
+NCFTP_VERSION:=3.2.4
 NCFTP_SOURCE:=ncftp-$(NCFTP_VERSION)-src.tar.bz2
 NCFTP_SITE:=ftp://ftp.ncftp.com/ncftp
 

package/netsnmp/Config.in

@@ -1,7 +1,13 @@
 config BR2_PACKAGE_NETSNMP
 	bool "netsnmp"
+	# Build with external toolchains is broken, libtool strips
+	# --sysroot at link time
+	depends on !BR2_TOOLCHAIN_EXTERNAL
 	help
 	  Suite of applications used to implement SNMP v1, SNMP v2c, and
 	  SNMP v3 using both IPv4 and IPv6.
 
 	  http://net-snmp.sourceforge.net/
+
+comment "lmbench is broken with external toolchains"
+        depends on BR2_TOOLCHAIN_EXTERNAL

package/ntfsprogs/Config.in

@@ -1,10 +1,11 @@
 config BR2_PACKAGE_NTFSPROGS
 	bool "ntfsprogs"
 	depends on BR2_USE_WCHAR
+	depends on BR2_LARGEFILE
 	help
 	  wide collection of NTFS utilities
 
 	  http://www.linux-ntfs.org/
 
-comment "ntfsprogs requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
+comment "ntfsprogs requires a toolchain with WCHAR and LARGEFILE support"
+	depends on !BR2_USE_WCHAR || !BR2_LARGEFILE

package/ntp/ntp-4.2.4_p5-nano.patch

@@ -0,0 +1,36 @@
+Fixes the MOD_NANO build failure
+
+ntp_loopfilter.c: In function 'local_clock':
+ntp_loopfilter.c:571: error: 'MOD_NANO' undeclared (first use in this function)
+ntp_loopfilter.c:571: error: (Each undeclared identifier is reported only once
+ntp_loopfilter.c:571: error: for each function it appears in.)
+ntp_loopfilter.c: In function 'loop_config':
+ntp_loopfilter.c:896: error: 'MOD_NANO' undeclared (first use in this function)
+
+Taken from
+http://cvs.fedoraproject.org/viewvc/devel/ntp/ntp-4.2.4p7-nano.patch?revision=1.1&content-type=text/plain&view=co
+
+See the discussion at
+https://bugs.launchpad.net/ubuntu/+source/ntp/+bug/412242 for more
+details and links. The below fix is not a correct fix, but only a
+workaround. The real fix required changes to kernel/libc headers.
+
+Index: ntp-4.2.4p5/include/ntp_syscall.h
+===================================================================
+--- ntp-4.2.4p5.orig/include/ntp_syscall.h	2010-05-14 17:34:48.000000000 +0200
++++ ntp-4.2.4p5/include/ntp_syscall.h	2010-05-14 17:35:13.000000000 +0200
+@@ -14,6 +14,14 @@
+ # include <sys/timex.h>
+ #endif
+ 
++#if defined(ADJ_NANO) && !defined(MOD_NANO)
++#define MOD_NANO ADJ_NANO
++#endif
++
++#if defined(ADJ_TAI) && !defined(MOD_TAI)
++#define MOD_TAI ADJ_TAI
++#endif
++
+ #ifndef NTP_SYSCALLS_LIBC
+ #ifdef NTP_SYSCALLS_STD
+ # define ntp_adjtime(t)		syscall(SYS_ntp_adjtime, (t))

package/ntp/ntp-optional-ipv6.patch

@@ -0,0 +1,24 @@
+[PATCH] ntpd: fix build without ipv6 support
+
+ntp_io.c was checkin the non-existing DISABLE_IPV6 define rather
+than WANT_IPV6 as defined in config.h, breaking the build if
+the toolchain doesn't have ipv6 support.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ ntpd/ntp_io.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: ntp-4.2.4p5/ntpd/ntp_io.c
+===================================================================
+--- ntp-4.2.4p5.orig/ntpd/ntp_io.c
++++ ntp-4.2.4p5/ntpd/ntp_io.c
+@@ -55,7 +55,7 @@
+  * Set up some macros to look for IPv6 and IPv6 multicast
+  */
+ 
+-#if defined(ISC_PLATFORM_HAVEIPV6) && !defined(DISABLE_IPV6)
++#if defined(ISC_PLATFORM_HAVEIPV6) && defined(WANT_IPV6)
+ 
+ #define INCLUDE_IPV6_SUPPORT
+ 

package/olsr/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_OLSR
 	bool "OLSR mesh networking Daemon"
+	depends on BR2_INET_IPV6
 	help
 	  The Optimized Link State Routing protocol (OLSR) is a
 	  routing protocol that is optimised for mobile ad-hoc
@@ -9,3 +10,6 @@ config BR2_PACKAGE_OLSR
 	  compute optimal forwarding paths locally.
 
 	  http://www.olsr.org/
+
+comment "olsr requires a toolchain with IPv6 support"
+	depends on !BR2_INET_IPV6

package/pango/Config.in

@@ -1,8 +1,11 @@
 config BR2_PACKAGE_PANGO
 	bool "pango"
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Pango is a library for laying out and rendering of text, with an
 	  emphasis on internationalization. Pango can be used anywhere that
@@ -11,3 +14,6 @@ config BR2_PACKAGE_PANGO
 	  core of text and font handling for GTK+-2.x.
 
 	  http://www.pango.org/
+
+comment "pango requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR

package/pango/S25pango

@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# run pango-querymodules if needed
+
+FILE=/etc/pango/pango.modules
+
+case "$1" in
+     start|"")
+	if [ ! -f $FILE ] ; then
+	   mkdir -p /etc/pango
+	   /usr/bin/pango-querymodules > "$FILE"
+	fi
+	;;
+    stop)
+	;;
+    *)
+	echo "Usage: $0 {start|stop}" >&2
+	exit 1
+	;;
+esac

package/pango/pango.mk

@@ -40,16 +40,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 PANGO_CONF_OPT = --enable-shared --enable-static \
 		--enable-explicit-deps=no --disable-debug
 
-HOST_PANGO_CONF_OPT = \
-		--disable-static \
-		$(if $(BR2_PACKAGE_XORG7),--with-x,--without-x) \
-		--disable-debug \
-
-PANGO_DEPENDENCIES = gettext libintl host-pkg-config host-pango libglib2 cairo
-
-HOST_PANGO_DEPENDENCIES = host-pkg-config host-cairo host-libglib2 host-autoconf host-automake
-
-HOST_PANGO_AUTORECONF = YES
+PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2 cairo
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
         PANGO_CONF_OPT += --with-x \
@@ -61,12 +52,7 @@ else
 endif
 
 $(eval $(call AUTOTARGETS,package,pango))
-$(eval $(call AUTOTARGETS,package,pango,host))
 
 $(PANGO_HOOK_POST_INSTALL):
-	mkdir -p $(TARGET_DIR)/etc/pango
-	$(PANGO_HOST_BINARY) > $(TARGET_DIR)/etc/pango/pango.modules
-	$(SED) 's~$(HOST_DIR)~~g' $(TARGET_DIR)/etc/pango/pango.modules
+	$(INSTALL) -m 755 package/pango/S25pango $(TARGET_DIR)/etc/init.d/
 	touch $@
-
-PANGO_HOST_BINARY:=$(HOST_DIR)/usr/bin/pango-querymodules

package/pciutils/pciutils.mk

@@ -15,6 +15,7 @@ PCIUTILS_DNS=no
 PCIUTILS_SHARED=yes
 
 define PCIUTILS_CONFIGURE_CMDS
+	$(SED) 's/wget --no-timestamping/wget/' $(PCIUTILS_DIR)/update-pciids.sh
 	$(SED) 's/uname -s/echo Linux/' \
 		-e 's/uname -r/echo $(LINUX_HEADERS_VERSION)/' \
 		$(PCIUTILS_DIR)/lib/configure
@@ -32,7 +33,7 @@ define PCIUTILS_BUILD_CMDS
 		SHARED=$(PCIUTILS_SHARED) \
 		ZLIB=$(PCIUTILS_ZLIB) \
 		DNS=$(PCIUTILS_DNS) \
-		SHAREDIR=/usr/share/misc
+		PREFIX=/usr
 endef
 
 # Ditch install-lib if SHARED is an option in the future

package/pcmanfm/Config.in

@@ -1,11 +1,15 @@
 config BR2_PACKAGE_PCMANFM
 	bool "pcmanfm"
 	depends on BR2_PACKAGE_XORG7
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_GAMIN
 	select BR2_PACKAGE_STARTUP_NOTIFICATION
-	select BR2_PACKAGE_LIBGTK2
+	depends on BR2_PACKAGE_LIBGTK2
 	help
 	  An extremly fast and lightweight file manager which features
 	  tabbed browsing and user-friendly interface.
 
 	  http://internap.dl.sourceforge.net/sourceforge/pcmanfm
+
+comment "pcmanfm requires a toolchain with WCHAR support"
+	depends on BR2_PACKAGE_XORG7 && !BR2_USE_WCHAR

package/php/Config.ext

@@ -67,10 +67,14 @@ config BR2_PACKAGE_PHP_EXT_FTP
 
 config BR2_PACKAGE_PHP_EXT_GETTEXT
 	bool "gettext"
-	select BR2_PACKAGE_GETTEXT
+	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+	depends on BR2_USE_WCHAR
 	help
 	  gettext support
 
+comment "gettext support requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
+
 config BR2_PACKAGE_PHP_EXT_GMP
 	bool "gmp"
 	select BR2_PACKAGE_LIBGMP

package/php/php.mk

@@ -84,7 +84,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y)
 	PHP_CONF_OPT += --with-gettext=$(STAGING_DIR)/usr
-	PHP_DEPENDENCIES += gettext
+	PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext)
 endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y)

package/pkg-config/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PKG_CONFIG
 	bool "pkg-config"
+	depends on BR2_USE_WCHAR # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  pkg-config is a system for managing library compile/link
@@ -8,3 +9,6 @@ config BR2_PACKAGE_PKG_CONFIG
 	  single tool.
 
 	  http://www.freedesktop.org/software/pkgconfig/
+
+comment "pkg-config requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR