buildroot: fix version for 2009.02-rc4

Patch by Maxim Grigoriev.

GCC 4.3.x would link with the correct shared library versions, but without
any RPATH, so it ended up looking for then in /usr/lib/ at runtime.
This is less than good, as the version there might not be compatible, and
even worse for distributions like Ubuntu, which doesn't install those
libs by default, the build breaks.

Fix it by forcing static linking instead.

Config.in

@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG
 
 config BR2_VERSION
 	string
-	default "2009.02-svn"
+	default "2009.02-rc4"
 
 source "target/Config.in.arch"
 source "target/device/Config.in"
@@ -69,6 +69,13 @@ config BR2_DL_DIR
 
 	  The default is $(BASE_DIR)/dl
 
+config BR2_COPYTO
+	string "Copy result to..."
+	default ""
+	help
+	  Setting this variable will (eventually) override 
+	  any other copyto configurations in buildroot.
+
 source	"target/device/Config.in.mirrors"
 
 config BR2_STAGING_DIR
@@ -109,18 +116,6 @@ config BR2_TOPDIR_SUFFIX
 	  build_ARCH -> build_ARCH_[SUFFIX]
 	  toolchain_build_ARCH -> toolchain_build_ARCH_[SUFFIX]
 
-config BR2_ROOTFS_PREFIX
-	string "Custom root fs prefix"
-	default "rootfs"
-	help
-	  Add a custom string to the beginning of the root file system name.
-
-config BR2_ROOTFS_SUFFIX
-	string "Custom root fs suffix"
-	default ""
-	help
-	  Add a custom string to the end of the root file system name.
-
 config BR2_GNU_BUILD_SUFFIX
 	string "GNU build hostname suffix"
 	default "pc-linux-gnu"
@@ -236,14 +231,14 @@ choice
 
 config BR2_STRIP_strip
 	bool "strip"
-	depends on !BR2_ENABLE_DEBUG
+	depends on !BR2_ENABLE_DEBUG && !BR2_ELF2FLT
 	help
 	  strip   is the normal strip command
 
 config BR2_STRIP_sstrip
 	bool "sstrip"
 	select BR2_PACKAGE_SSTRIP_HOST
-	depends on !BR2_ENABLE_DEBUG
+	depends on !BR2_ENABLE_DEBUG && !BR2_ELF2FLT
 	help
 	  sstrip  is a strip that discards more than the normal strip
 

Makefile

@@ -40,6 +40,11 @@ else
 BR2_LOCAL:=$(TOPDIR)/local
 endif
 
+# Variables for use in Make constructs
+comma:=,
+empty:=
+space:=$(empty) $(empty)
+
 # $(shell find . -name *_defconfig |sed 's/.*\///')
 # Pull in the user's configuration file
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
@@ -127,9 +132,6 @@ HOSTCPP:=$(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp)
 HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
 HOSTLN:=$(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
 HOSTNM:=$(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
-HOST_GLIB_BIN:=`dirname $(shell which glib-genmarshal || echo /usr/bin/glib-genmarshal)`
-HOST_GLIB:=$(shell dirname $(HOST_GLIB_BIN) || echo /usr)
-
 
 ifndef CFLAGS_FOR_BUILD
 CFLAGS_FOR_BUILD:=-g -O2
@@ -211,7 +213,7 @@ BASE_TARGETS:=uclibc
 endif
 TARGETS:=
 
-# setup our pathes
+# setup our paths
 include project/Makefile.in
 
 BR2_DEPENDS_DIR=$(PROJECT_BUILD_DIR)/buildroot-config
@@ -471,14 +473,18 @@ clean:
 distclean: clean
 	rm -rf sources/*
 
+
 endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
+flush:
+	rm -f $(PROJECT_BUILD_DIR)/tgt-config.cache
+
 %_defconfig: $(CONFIG)/conf
 	cp $(shell find ./target/ -name $@) .config
 	-@$(MAKE) oldconfig
 
 update:
-	cp .config $(BOARD_PATH)/$(BOARD_NAME)_defconfig
+	cp .config $(BOARD_PATH)/$(PROJECT)_defconfig
 
 configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config
 
@@ -514,6 +520,7 @@ help:
 	@echo '  source                 - download all sources needed for offline-build'
 	@echo '  source-check           - check all packages for valid download URLs'
 	@echo '  external-deps          - list external packages used'
+	@echo '  flush                  - flush configuration cache'
 	@echo
 	@echo 'See docs/README and docs/buildroot.html for further details'
 	@echo

docs/buildroot.html

@@ -247,6 +247,10 @@
     <li>HOSTCC</li>
     <li>UCLIBC_CONFIG_FILE=&lt;path/to/.config&gt;</li>
     <li>BUSYBOX_CONFIG_FILE=&lt;path/to/.config&gt;</li>
+    <li>BUILDROOT_COPYTO</li>
+    <li>BUILDROOT_DL_DIR</li>
+    <li>BUILDROOT_LOCAL</li>
+    <li>BUILDROOT_USE_XWINDOWS</li>
     </ul>
 
     <p>An example that uses config files located in the toplevel directory and
@@ -261,6 +265,16 @@ $ make UCLIBC_CONFIG_FILE=uClibc.config BUSYBOX_CONFIG_FILE=$HOME/bb.config
 $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD
 </pre>
 
+    <p>If you want the result of your build to be copied to another directory
+    like /tftpboot for downloading to a board using tftp, then you
+    can use BUILDROOT_COPYTO to specify your location</p>
+    <p>Typically, this is set in your ~/.bashrc file
+
+<pre>
+$ export BUILDROOT_COPYTO=/tftpboot
+</pre>
+
+
     <h3><a name="helper_completion" id="helper_completion"></a>
     Using auto-completion</h3>
 
@@ -635,52 +649,22 @@ $ make me&lt;TAB&gt;
     conflicts, but will use unique build directories, where the user
     can configure the build. </p>
 
-    <p><b>THINGS TO DO</b></p>
-
+    <h2><a name="Linux" id="Linux"></a>Linux</h2>
     <ol>
 
-    <li>Linux</li>
 
-    <p>The current Linux implementation is flawed. It only works
-    if the user chooses to use one of the few kernels selected
-    as base for the kernel-headers. While the Makefile seems to have
-    hooks, allowing the developer to specify whatever version he/she
-    wants in the target/device/*/* Makefiles, the build will fail
-    if another kernel version is choosen.</p>
-
-    <p>The reason for this is that the kernel patches are not
-    applied by the <code>&quot;target/linux/linux.mk&quot;</code>
-    build script fragment. They are only applied by the
-    <code>&quot;toolchain/kernel-headers/*.makefile&quot;</code>
-    build script fragments</p>
-
-    <p>If the kernel-header version and the linux version differs,
-    there will be two <code>&quot;linux-2.6.X.Y&quot;</code>
-    directories in
-    <code>&quot;build_&lt;ARCH&gt;/&lt;&gt;&quot;</code>,
-    each with its own set of patches. </p>
-
-    <p>The solution in the works, is to move the build of Linux to
-    <code>&quot;project_build_&lt;ARCH&gt;/&lt;project name&gt;/linux-2.6.X.Y&quot;</code> combined with method to configure
-     which patches can be applied. Possibly, the linux source tree
-     used to generate the kernel headers will be moved to the
-     <code>&quot;toolchain_build_&lt;ARCH&gt;&quot;</code>
-     directory
-      </p>
-
-     <p>The user will be able to select from three different
-     Linux strategies:
+     <p>The user can select from three different Linux strategies:
 
      <ul>
-     <li>Conservative Strategy: Only use version ssupported by the kernel headers</li>
-     <li>Stable Linux Strategy: Allow any 2.6.X.Y combination.
+     <li>Legacy: Only use version supported by the kernel headers</li>
+     <li>Advanced: Allow any 2.6.X.Y combination.
 	(Minimum 2.6.19)</li>
      <li>Power-User Strategy: Allow
      <code>&quot;-git&quot;</code>, or
      <code>&quot;-mm&quot;</code>, or user downloadable kernels</li>
      </ul>
 
-     <p>The current kernel patches can be configured to be applied to the
+     <p>The current kernel patches can be applied to the
      linux source tree even if the version differs from the
      kernel header version. </p>
 
@@ -690,7 +674,7 @@ $ make me&lt;TAB&gt;
      proprietary kernel-patch or decide to not apply the kernel
      patches</p>
 
-     <p>Other optional patches will be <u>board specific</u> or
+     <p>There is also support for <u>board specific</u> and
      <u>architecture specific</u> patches. </p>
 
      <p>There will also be a way for the user to supply absolute
@@ -702,8 +686,17 @@ $ make me&lt;TAB&gt;
      <p>Maybe, there will also be a possibility to supply an
      <code>&quot;URL&quot;</code> to a patch available on Internet. </p>
 
-     <li>Configurable packages</li>
+     <p>
+	If there is no linux config file available,
+	buildroot starts the linux configuration system, which
+	defaults to "make menuconfig".
+     </p>
+    </ol>
 
+    <h2><a name="Todo" id="Todo"></a>Todo</h2>
+    <ol>
+
+     <li>Configurable packages</li>
      <p>Many packages can, on top of the simple
      &quot;enable/disable build&quot;,
      be further configured using Kconfig.

docs/news.html

@@ -3,6 +3,27 @@
 
 <ul>
 
+  <li><b>31 January 2009 -- 2009.02-rc3 released</b>
+      <p>RC3 is out with more cleanups and bug fixes. Unless big issues
+    are found, expect this to be the last release candidate before the
+    release - So give it a good test.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.02-rc3.tar.bz2">2009.02-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="http://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>23 January 2009 -- 2009.02-rc2 released</b>
+    <p>Another week, another release candidate with a bunch of
+    cleanups and build fixes.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.02-rc2.tar.bz2">2009.02-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="http://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>16 January 2009 -- Release candidate and new maintainer</b>
     <p>It has been a long time coming, but we finally have a new
     release candidate! - And a new maintainer to match (Peter Korsgaard).</p>

package/Config.in

@@ -86,7 +86,6 @@ source "package/logrotate/Config.in"
 source "package/lsof/Config.in"
 source "package/ltp-testsuite/Config.in"
 source "package/ltrace/Config.in"
-source "package/ltt/Config.in"
 source "package/memstat/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/module-init-tools/Config.in"
@@ -189,6 +188,7 @@ source "package/openvpn/Config.in"
 source "package/openswan/Config.in"
 source "package/portmap/Config.in"
 source "package/pppd/Config.in"
+source "package/radvd/Config.in"
 source "package/rp-pppoe/Config.in"
 source "package/pptp-linux/Config.in"
 source "package/proftpd/Config.in"

package/Makefile.autotools.in

@@ -38,6 +38,8 @@
 #	environment passed to the <configure> script
 # FOO_CONF_OPT [default empty]
 #	arguments passed to the <configure> script
+# FOO_MAKE [default $(MAKE)]
+#	command to use to execute <make>
 # FOO_MAKE_ENV [default empty]
 #	environment passed to all calls to <make> in the package source
 #	directory
@@ -257,13 +259,13 @@ $(BUILD_DIR)/%/.stamp_configured:
 # Build
 $(BUILD_DIR)/%/.stamp_built:
 	$(call MESSAGE,"Building")
-	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 	$(Q)touch $@
 
 # Install to staging dir
 $(BUILD_DIR)/%/.stamp_staging_installed:
 	$(call MESSAGE,'Installing to host (staging directory)')
-	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_INSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_INSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 #	toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr"
 	for i in $$(find $(STAGING_DIR)/usr/lib/ -name "*.la"); do \
 		cp $$i $$i~; \
@@ -274,7 +276,7 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
 # Install to target dir
 $(PROJECT_BUILD_DIR)/autotools-stamps/%_target_installed:
 	$(call MESSAGE,"Installing to target")
-	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_INSTALL_TARGET_OPT) -C $($(PKG)_DIR)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_INSTALL_TARGET_OPT) -C $($(PKG)_DIR)/$($(PKG)_SUBDIR)
 	$(if $(BR2_HAVE_MANPAGES),,for d in man share/man; do \
 		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
 	done)
@@ -288,14 +290,14 @@ $(PROJECT_BUILD_DIR)/autotools-stamps/%_target_installed:
 
 $(BUILD_DIR)/%/.stamp_cleaned:
 	$(call MESSAGE,"Cleaning up")
-	-$($(PKG)_MAKE_ENV) $(MAKE)  $($(PKG)_CLEAN_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	-$($(PKG)_MAKE_ENV) $($(PKG)_MAKE)  $($(PKG)_CLEAN_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 	rm -f $(@D)/.stamp_built
 
 $(BUILD_DIR)/%/.stamp_uninstalled:
 	$(call MESSAGE,"Uninstalling")
-	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_UNINSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_UNINSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 	rm -f $(@D)/.stamp_staging_installed
-	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_UNINSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_UNINSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 	rm -f $($(PKG)_TARGET_INSTALL_TARGET) $($(PKG)_HOOK_POST_INSTALL)
 
 $(BUILD_DIR)/%/.stamp_dircleaned:
@@ -331,6 +333,7 @@ $(2)_LIBTOOL_PATCH		?= YES
 $(2)_USE_CONFIG_CACHE   ?= $(if $(BR2_CONFIG_CACHE),YES,NO)
 $(2)_CONF_ENV			?=
 $(2)_CONF_OPT			?=
+$(2)_MAKE			?= $(MAKE)
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPT			?=
 $(2)_INSTALL_STAGING		?= NO

package/Makefile.in

@@ -10,19 +10,19 @@ MAKE1:=$(HOSTMAKE) -j1
 MAKE:=$(HOSTMAKE) -j$(BR2_JLEVEL)
 
 ifeq ($(BR2_OPTIMIZE_0),y)
-TARGET_OPTIMIZATION=-O0
+TARGET_OPTIMIZATION+=-O0
 endif
 ifeq ($(BR2_OPTIMIZE_1),y)
-TARGET_OPTIMIZATION=-O1
+TARGET_OPTIMIZATION+=-O1
 endif
 ifeq ($(BR2_OPTIMIZE_2),y)
-TARGET_OPTIMIZATION=-O2
+TARGET_OPTIMIZATION+=-O2
 endif
 ifeq ($(BR2_OPTIMIZE_3),y)
-TARGET_OPTIMIZATION=-O3
+TARGET_OPTIMIZATION+=-O3
 endif
 ifeq ($(BR2_OPTIMIZE_S),y)
-TARGET_OPTIMIZATION=-Os
+TARGET_OPTIMIZATION+=-Os
 endif
 ifeq ($(BR2_DEBUG_1),y)
 TARGET_DEBUGGING=-g1

package/acpid/acpid-sign-warning.patch

@@ -1,11 +0,0 @@
---- acpid-1.0.4/ud_socket.c
-+++ acpid-1.0.4/ud_socket.c
-@@ -58,7 +58,7 @@ ud_accept(int listenfd, struct ucred *cr
- 	while (1) {
- 		int newsock = 0;
- 		struct sockaddr_un cliaddr;
--		int len = sizeof(struct sockaddr_un);
-+		socklen_t len = sizeof(struct sockaddr_un);
- 
- 		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
- 		if (newsock < 0) {

package/acpid/acpid-socket-path.patch

@@ -1,11 +0,0 @@
---- acpid-1.0.4/acpid.h
-+++ acpid-1.0.4/acpid.h
-@@ -32,7 +32,7 @@
- #define ACPI_EVENTFILE		ACPI_PROCDIR "/event"
- #define ACPI_CONFDIR		"/etc/acpi/events"
- #define ACPI_LOGFILE		"/var/log/acpid"
--#define ACPI_SOCKETFILE		"/var/run/acpid.socket"
-+#define ACPI_SOCKETFILE		"/tmp/acpid.socket"
- #define ACPI_SOCKETMODE		0666
- #define ACPI_MAX_ERRS		5
- 

package/argus/Config.in

@@ -1,3 +1,6 @@
+comment "argus has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_ARGUS
+
 config BR2_PACKAGE_ARGUS
 	bool "argus"
 	select BR2_PACKAGE_LIBPCAP

package/autoconf/autoconf.mk

@@ -3,7 +3,7 @@
 # autoconf
 #
 #############################################################
-AUTOCONF_VERSION:=2.61
+AUTOCONF_VERSION:=2.63
 AUTOCONF_SOURCE:=autoconf-$(AUTOCONF_VERSION).tar.bz2
 AUTOCONF_SITE:=$(BR2_GNU_MIRROR)/autoconf
 AUTOCONF_CAT:=$(BZCAT)

package/avahi/avahi.mk

@@ -158,6 +158,7 @@ $(TARGET_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.installed
 	chmod 0755 $(TARGET_DIR)/usr/share/udhcpc/default.script
 	cp -af package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/
 	cp $(STAGING_DIR)/usr/sbin/avahi-autoipd $@
+	rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
 	ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 

package/bind/Config.in

@@ -1,3 +1,6 @@
+comment "bind has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_BIND
+
 config BR2_PACKAGE_BIND
 	bool "bind"
 	help

package/busybox/busybox-1.13.2-init.patch

@@ -0,0 +1,50 @@
+--- busybox-1.13.2/init/init.c	Wed Dec 31 04:06:45 2008
++++ busybox-1.13.2-init/init/init.c	Thu Jan 29 03:02:13 2009
+@@ -671,15 +671,14 @@
+  */
+ static void parse_inittab(void)
+ {
++#if ENABLE_FEATURE_USE_INITTAB
+ 	char *token[4];
+-	/* order must correspond to SYSINIT..RESTART constants */
+-	static const char actions[] ALIGN1 =
+-		"sysinit\0""respawn\0""askfirst\0""wait\0""once\0"
+-		"ctrlaltdel\0""shutdown\0""restart\0";
++	parser_t *parser = config_open2("/etc/inittab", fopen_for_read);
+ 
+-	parser_t *parser = config_open2(INITTAB, fopen_for_read);
+-	/* No inittab file -- set up some default behavior */
+-	if (parser == NULL) {
++	if (parser == NULL)
++#endif
++	{
++		/* No inittab file -- set up some default behavior */
+ 		/* Reboot on Ctrl-Alt-Del */
+ 		new_init_action(CTRLALTDEL, "reboot", "");
+ 		/* Umount all filesystems on halt/reboot */
+@@ -699,11 +698,17 @@
+ 		new_init_action(SYSINIT, INIT_SCRIPT, "");
+ 		return;
+ 	}
++
++#if ENABLE_FEATURE_USE_INITTAB
+ 	/* optional_tty:ignored_runlevel:action:command
+ 	 * Delims are not to be collapsed and need exactly 4 tokens
+ 	 */
+ 	while (config_read(parser, token, 4, 0, "#:",
+ 				PARSE_NORMAL & ~(PARSE_TRIM | PARSE_COLLAPSE))) {
++		/* order must correspond to SYSINIT..RESTART constants */
++		static const char actions[] ALIGN1 =
++			"sysinit\0""respawn\0""askfirst\0""wait\0""once\0"
++			"ctrlaltdel\0""shutdown\0""restart\0";
+ 		int action;
+ 		char *tty = token[0];
+ 
+@@ -727,6 +732,7 @@
+ 				parser->lineno);
+ 	}
+ 	config_close(parser);
++#endif
+ }
+ 
+ #if ENABLE_FEATURE_USE_INITTAB

package/busybox/busybox-1.13.2-modprobe.patch

@@ -0,0 +1,99 @@
+--- busybox-1.13.2/modutils/modutils-24.c	Sat Nov 29 07:48:56 2008
++++ busybox-1.13.2-modprobe/modutils/modutils-24.c	Sun Feb  1 00:08:26 2009
+@@ -2150,7 +2150,7 @@
+ 	sec->name = name;
+ 	sec->idx = newidx;
+ 	if (size)
+-		sec->contents = xmalloc(size);
++		sec->contents = xzalloc(size);
+ 
+ 	obj_insert_section_load_order(f, sec);
+ 
+@@ -2165,7 +2165,7 @@
+ 	int newidx = f->header.e_shnum++;
+ 	struct obj_section *sec;
+ 
+-	f->sections = xrealloc(f->sections, (newidx + 1) * sizeof(sec));
++	f->sections = xrealloc_vector(f->sections, 2, newidx);
+ 	f->sections[newidx] = sec = arch_new_section();
+ 
+ 	sec->header.sh_type = SHT_PROGBITS;
+@@ -2175,7 +2175,7 @@
+ 	sec->name = name;
+ 	sec->idx = newidx;
+ 	if (size)
+-		sec->contents = xmalloc(size);
++		sec->contents = xzalloc(size);
+ 
+ 	sec->load_next = f->load_order;
+ 	f->load_order = sec;
+@@ -2571,8 +2571,7 @@
+ 	/* Collect the modules' symbols.  */
+ 
+ 	if (nmod) {
+-		ext_modules = modules = xmalloc(nmod * sizeof(*modules));
+-		memset(modules, 0, nmod * sizeof(*modules));
++		ext_modules = modules = xzalloc(nmod * sizeof(*modules));
+ 		for (i = 0, mn = module_names, m = modules;
+ 				i < nmod; ++i, ++m, mn += strlen(mn) + 1) {
+ 			struct new_module_info info;
+@@ -2652,13 +2651,14 @@
+ }
+ 
+ 
+-static void  new_create_this_module(struct obj_file *f, const char *m_name)
++static void new_create_this_module(struct obj_file *f, const char *m_name)
+ {
+ 	struct obj_section *sec;
+ 
+ 	sec = obj_create_alloced_section_first(f, ".this", tgt_sizeof_long,
+ 			sizeof(struct new_module));
+-	memset(sec->contents, 0, sizeof(struct new_module));
++	/* done by obj_create_alloced_section_first: */
++	/*memset(sec->contents, 0, sizeof(struct new_module));*/
+ 
+ 	obj_add_symbol(f, SPFX "__this_module", -1,
+ 			ELF_ST_INFO(STB_LOCAL, STT_OBJECT), sec->idx, 0,
+@@ -2965,9 +2965,9 @@
+ 		if (i == f->header.e_shnum) {
+ 			struct obj_section *sec;
+ 
++			f->header.e_shnum++;
+ 			f->sections = xrealloc_vector(f->sections, 2, i);
+ 			f->sections[i] = sec = arch_new_section();
+-			f->header.e_shnum = i + 1;
+ 
+ 			sec->header.sh_type = SHT_PROGBITS;
+ 			sec->header.sh_flags = SHF_WRITE | SHF_ALLOC;
+@@ -3006,12 +3006,9 @@
+ 	for (i = 0; i < f->header.e_shnum; ++i) {
+ 		struct obj_section *s = f->sections[i];
+ 		if (s->header.sh_type == SHT_NOBITS) {
++			s->contents = NULL;
+ 			if (s->header.sh_size != 0)
+-				s->contents = memset(xmalloc(s->header.sh_size),
+-						0, s->header.sh_size);
+-			else
+-				s->contents = NULL;
+-
++				s->contents = xzalloc(s->header.sh_size);
+ 			s->header.sh_type = SHT_PROGBITS;
+ 		}
+ 	}
+@@ -3275,14 +3272,13 @@
+ 			case SHT_SYMTAB:
+ 			case SHT_STRTAB:
+ 			case SHT_RELM:
++				sec->contents = NULL;
+ 				if (sec->header.sh_size > 0) {
+-					sec->contents = xmalloc(sec->header.sh_size);
++					sec->contents = xzalloc(sec->header.sh_size);
+ 					fseek(fp, sec->header.sh_offset, SEEK_SET);
+ 					if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) {
+ 						bb_perror_msg_and_die("error reading ELF section data");
+ 					}
+-				} else {
+-					sec->contents = NULL;
+ 				}
+ 				break;
+ 

package/busybox/busybox.mk

@@ -42,18 +42,10 @@ else
 endif
 	touch $@
 
-$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
+$(BUSYBOX_DIR)/.config: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
 	cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
 	$(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
 		$(BUSYBOX_DIR)/.config
-ifeq ($(BR2_BUSYBOX_VERSION_1_0_1),y)
-	$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\PREFIX=$(TARGET_DIR),;" \
-		$(BUSYBOX_DIR)/Rules.mak
-endif
-ifeq ($(BR2_BUSYBOX_VERSION_1_1_3),y)
-	$(SED) s,^PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
-		$(BUSYBOX_DIR)/.config
-endif
 ifeq ($(BR2_BUSYBOX_VERSION_1_2_2_1),y)
 	$(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
 		$(BUSYBOX_DIR)/.config
@@ -105,7 +97,7 @@ endif
 	touch $@
 
 
-$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
+$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.config
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
 		ARCH=$(KERNEL_ARCH) \
@@ -137,9 +129,9 @@ busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE)
 
 busybox-unpacked: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.unpacked
 
-busybox-config: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.configured
+busybox-config: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.config
 
-busybox-menuconfig: host-sed $(PROJECT_BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.configured
+busybox-menuconfig: host-sed $(PROJECT_BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.config
 	$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig
 
 busybox-update:

package/cups/cups.mk

@@ -3,23 +3,59 @@
 # cups
 #
 ################################################################################
-CUPS_VERSION = 1.3.5
+CUPS_VERSION = 1.3.9
 CUPS_NAME = cups-$(CUPS_VERSION)
 CUPS_DIR = $(BUILD_DIR)/$(CUPS_NAME)
-CUPS_SITE = http://ftp.easysw.com/pub/cups/1.3.5
+CUPS_SITE = http://ftp.easysw.com/pub/cups/$(CUPS_VERSION)
 CUPS_SOURCE:=$(CUPS_NAME)-source.tar.bz2
 CUPS_DESTDIR:=$(STAGING_DIR)/usr/lib
 CUPS_CAT:=$(BZCAT)
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
-        CUPS_CONF_OPT_DBUS =--enable-dbus
-        CUPS_DEPENDENCIES_DBUS = dbus
+	CUPS_CONF_OPT += --enable-dbus
+	CUPS_DEPENDENCIES += dbus
 else
-        CUPS_CONF_OPT_DBUS =--disable-dbus
+	CUPS_CONF_OPT += --disable-dbus
 endif
 
 ifneq ($(BR2_PACKAGE_XSERVER_none),y)
-        CUPS_DEPENDENCIES_X = xlib_libX11
+	CUPS_DEPENDENCIES += xlib_libX11
+endif
+
+CUPS_CONF_OPT +=	--disable-perl
+CUPS_CONF_OPT +=	--disable-java
+CUPS_CFLAGS = $(TARGET_CFLAGS)
+
+
+ifeq ($(BR2_PACKAGE_PERL),disabled)	# We do not provide perl (yet)
+	CUPS_CONF_ENV +=	ac_cv_path_perl=$(STAGING_DIR)/usr/bin/perl
+	CUPS_CONF_OPT +=	--with-perl
+	CUPS_DEPENDENCIES +=	microperl
+else
+	CUPS_CONF_OPT +=	--disable-perl
+endif
+
+ifeq ($(BR2_PACKAGE_PHP),y)
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/main
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/regex
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/TSRM
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/Zend
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/ext
+	CUPS_CONF_ENV +=	ac_cv_path_php=$(STAGING_DIR)/usr/bin/php
+	CUPS_CONF_OPT +=	--with-php
+	CUPS_DEPENDENCIES +=	php
+else
+	CUPS_CONF_OPT +=	--disable-php
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
+	CUPS_CONF_ENV +=	ac_cv_path_python=$(STAGING_DIR)/usr/bin/python
+	CUPS_CONF_OPT +=	--with-python
+	CUPS_DEPENDENCIES +=	python
+else
+	CUPS_CONF_OPT +=	--disable-python
 endif
 
 $(DL_DIR)/$(CUPS_SOURCE):
@@ -35,13 +71,25 @@ $(CUPS_DIR)/.configured: $(CUPS_DIR)/.unpacked
 	(cd $(CUPS_DIR) && \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
+		$(CUPS_CONF_ENV) \
+		CFLAGS="$(CUPS_CFLAGS)" \
 		./configure \
-		--prefix=/usr $(CUPS_CONF_OPT_DBUS) --includedir=/usr/include  \
-		--libdir=/usr/lib --disable-gnutls --disable-gssapi --host=$(ARCH) \ )
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-config-file-path=/etc \
+		--disable-gnutls \
+		--disable-gssapi \
+		$(CUPS_CONF_OPT) \
+		)
 	touch $@
 
 $(CUPS_DIR)/.compiled: $(CUPS_DIR)/.configured
-	$(MAKE) -C $(CUPS_DIR) cups backend berkeley cgi-bin filter \
+	$(MAKE) CFLAGS="$(CUPS_CFLAGS)" -C $(CUPS_DIR) cups backend berkeley cgi-bin filter \
 	locale monitor notifier pdftops scheduler systemv scripting/php \
 	conf data doc fonts ppd templates
 	touch $@
@@ -55,11 +103,14 @@ $(CUPS_DIR)/.installed: $(CUPS_DIR)/.compiled
 	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/bin/cups-config
 	touch $@
 
-cups: uclibc $(CUPS_DEPENDENCIES_DBUS) $(CUPS_DEPENDENCIES_X) $(CUPS_DIR)/.installed
+cups: uclibc $(CUPS_DEPENDENCIES) $(CUPS_DIR)/.installed
 
 cups-clean:
 	-$(MAKE) -C $(CUPS_DIR) clean
 
+cups-dirclean:
+	rm -fr $(CUPS_DIR)
+
 #############################################################
 #
 # Toplevel Makefile options
@@ -67,4 +118,5 @@ cups-clean:
 #############################################################
 ifeq ($(BR2_PACKAGE_CUPS),y)
 TARGETS+=cups
-endif
+endif
+

package/database/mysql_client/Config.in

@@ -1,4 +1,10 @@
 config BR2_PACKAGE_MYSQL_CLIENT
 	bool "MySQL 5.1 client"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
 	help
 	  MySQL client
+
+comment "Mysql client requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP

package/database/mysql_client/mysql_client.mk

@@ -8,23 +8,24 @@ MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
 MYSQL_CLIENT_SITE = http://mirrors.24-7-solutions.net/pub/mysql/Downloads/MySQL-5.1
 MYSQL_CLIENT_INSTALL_TARGET = YES
 MYSQL_CLIENT_INSTALL_STAGING = YES
-MYSQL_CLIENT_DEPENDENCIES = uclibc readline
+MYSQL_CLIENT_DEPENDENCIES = uclibc readline ncurses
 
 MYSQL_CLIENT_CONF_ENV = ac_cv_sys_restartable_syscalls=yes
 MYSQL_CLIENT_CONF_OPT = \
-	--target=$(GNU_TARGET_NAME) \
-	--host=$(GNU_TARGET_NAME) \
-	--build=$(GNU_HOST_NAME) \
 	--program-prefix="" \
-	--prefix=/usr \
 	--without-ndb-binlog \
 	--without-server \
 	--without-docs \
 	--without-man \
 	--without-readline \
 	--without-libedit \
+	--with-readline=$(STAGING_DIR)/usr \
 	--with-low-memory \
 	--enable-thread-safe-client \
 	$(ENABLE_DEBUG)
 
 $(eval $(call AUTOTARGETS,package/database,mysql_client))
+
+$(MYSQL_CLIENT_HOOK_POST_INSTALL):
+	rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
+	touch $@

package/database/sqlite/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_SQLITE
 	bool "sqlite"
 	select BR2_PACKAGE_NCURSES
-	select BR2_READLINE
+	select BR2_PACKAGE_READLINE
 	help
 	  SQLite is a small C library that implements a self-contained,
 	  embeddable, zero-configuration SQL database engine.

package/database/sqlite/sqlite.mk

@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION:=3.6.4
+SQLITE_VERSION:=3.6.10
 SQLITE_SOURCE:=sqlite-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE:=http://www.sqlite.org
 SQLITE_DIR:=$(BUILD_DIR)/sqlite-$(SQLITE_VERSION)
@@ -55,7 +55,7 @@ $(TARGET_DIR)/usr/bin/sqlite3: $(STAGING_DIR)/usr/bin/sqlite3
 	cp -dpf $(STAGING_DIR)/usr/lib/libsqlite3*.so* $(TARGET_DIR)/usr/lib/
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsqlite3.so
 
-sqlite: uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3
+sqlite: uclibc ncurses $(TARGET_DIR)/usr/bin/sqlite3
 
 sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE)
 

package/dbus/dbus.mk

@@ -19,7 +19,11 @@ DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
 else
 DBUS_XML:=libxml
 # Makefile.autotools.in unfortunately has broken dependency handling,
-# so we cannot do the same for libxml2
+# so we cannot do the same for libxml2 as the targets (like
+# libxml2-install-staging) are phony and hence, dbus will always be
+# considered out-of-date. Using the corresponding .stamp_* files (E.G.
+# LIBXML2_TARGET_INSTALL_STAGING doesn't work as there's no dependency
+# information between them.
 DBUS_XML_DEP:=libxml2-install-staging
 endif
 
@@ -64,9 +68,12 @@ $(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)
 
 $(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured
 	$(MAKE) -C $(DBUS_DIR) all
+	touch $@
 
 $(STAGING_DIR)/$(DBUS_TARGET_BINARY): $(DBUS_DIR)/$(DBUS_BINARY)
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR) install
+	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libdbus-1.la
+	touch $@
 
 $(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/$(DBUS_TARGET_BINARY)
 	mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/var/lib/dbus $(TARGET_DIR)/etc/init.d

package/directfb/directfb.mk

@@ -52,9 +52,6 @@ endif
 ifeq ($(DIRECTFB_GFX),)
 DIRECTFB_GFX:=none
 else
-comma:=,
-empty:=
-space:=$(empty) $(empty)
 DIRECTFB_GFX:=$(subst $(space),$(comma),$(strip $(DIRECTFB_GFX)))
 endif
 
@@ -75,9 +72,6 @@ endif
 ifeq ($(DIRECTFB_INPUT),)
 DIRECTFB_INPUT:=none
 else
-comma:=,
-empty:=
-space:=$(empty) $(empty)
 DIRECTFB_INPUT:=$(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT)))
 endif
 

package/dmraid/Config.in

@@ -1,3 +1,6 @@
+comment "dmraid has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_DMRAID
+
 config BR2_PACKAGE_DMRAID
 	bool "dmraid"
 	select BR2_PACKAGE_DM

package/editors/vim/vim.mk

@@ -9,7 +9,7 @@ VIM_SITE:=http://ftp.vim.org/pub/vim
 VIM_SOURCE_SITE:=$(VIM_SITE)/unix
 VIM_PATCH_SITE:=$(VIM_SITE)/patches/7.1
 VIM_DIR:=$(BUILD_DIR)/vim71
-VIM_PATCHES:=$(shell cat package/editors/vim/patches | sed -s 's:\(.\+\):$(DL_DIR)/vim/$(VIM_VERSION).\1:')
+VIM_PATCHES:=$(shell sed -e 's:^:$(DL_DIR)/vim/$(VIM_VERSION).:' package/editors/vim/patches)
 VIM_CONFIG_H:=$(VIM_DIR)/src/auto/config.h
 VIM_CONFIG_MK:=$(VIM_DIR)/src/auto/config.mk
 

package/freetype/freetype.mk

@@ -4,13 +4,14 @@
 #
 #############################################################
 FREETYPE_VERSION = $(strip $(subst ",, $(BR2_FREETYPE_VERSION)))
+#"))
 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_LIBTOOL_PATCH = NO
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_INSTALL_TARGET = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
-FREETYPE_DEPENDENCIES = uclibc pkgconfig zlib
+FREETYPE_DEPENDENCIES = uclibc pkgconfig $(if $(BR2_PACKAGE_ZLIB),zlib)
 
 $(eval $(call AUTOTARGETS,package,freetype))
 

package/gamin/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_GAMIN
 	bool "gamin"
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  the File Alteration Monitor
 

package/gamin/gamin.mk

@@ -10,13 +10,17 @@ GAMIN_AUTORECONF = NO
 GAMIN_INSTALL_STAGING = YES
 GAMIN_INSTALL_TARGET = YES
 
-GAMIN_CONF_OPT = --program-prefix=""
+GAMIN_CONF_OPT = --program-prefix="" --disable-debug
 
 GAMIN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
 GAMIN_CONF_ENV = have_abstract_sockets=no
 
-GAMIN_DEPENDENCIES = uclibc libgtk2
+ifneq ($(BR2_LARGEFILE),y)
+GAMIN_CONF_ENV += CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
+endif
+
+GAMIN_DEPENDENCIES = uclibc libglib2
 
 $(eval $(call AUTOTARGETS,package,gamin))
 

package/gmp/gmp.mk

@@ -83,7 +83,7 @@ $(GMP_DIR2)/.configured: $(GMP_DIR)/.unpacked
 		--prefix="$(GMP_HOST_DIR)" \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
-		--enable-shared \
+		--disable-shared \
 		--enable-static \
 		$(DISABLE_NLS) \
 	)

package/icu/Config.in

@@ -1,4 +1,11 @@
 config BR2_PACKAGE_ICU
 	bool "icu"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
 	help
 	  International Components for Unicode.
+
+	  http://icu-project.org/
+
+comment "icu requires a toolchain with C++ support and WCHAR enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR

package/ipsec-tools/Config.in

@@ -51,7 +51,7 @@ config BR2_PACKAGE_IPSEC_TOOLS_IPV6
 
 config BR2_PACKAGE_IPSEC_TOOLS_READLINE
 	depends on BR2_PACKAGE_IPSEC_TOOLS
-	select BR2_READLINE
+	select BR2_PACKAGE_READLINE
 	bool "Enable readline input support if available."
 
 config BR2_PACKAGE_IPSEC_TOOLS_LIBS

package/irda-utils/Config.in

@@ -1,7 +1,9 @@
 menuconfig BR2_PACKAGE_IRDA_UTILS
 	bool "irda_utils"
+	depends on BROKEN
 	help
-		Tools for accessing the irda-Subsystem of the Linux-Kernel
+	  Tools for accessing the irda-Subsystem of the Linux-Kernel
+	  The makefile is totally broken.
 
 if BR2_PACKAGE_IRDA_UTILS
 config IRDA_IRATTACH
@@ -39,5 +41,5 @@ config IRDA_SMCINIT
 	help
 		Some Toshiba Laptops have buggy BIOSes which didn't initialize
 		Irda. This may help those.
-	
+
 endif

package/kismet/Config.in

@@ -1,3 +1,6 @@
+comment "kismet has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_KISMET
+
 config BR2_PACKAGE_KISMET
 	bool "kismet"
 	select BR2_PACKAGE_NCURSES

package/libcgicc/Config.in

@@ -1,8 +1,11 @@
 config BR2_PACKAGE_LIBCGICC
 	bool "libcgicc"
-	select BR2_INSTALL_LIBSTDCPP
+	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  GNU cgicc is a C++ class library that greatly simplifies
 	  the creation of CGI applications for the World Wide Web.
 
 	  http://www.cgicc.com
+
+comment "libcgicc requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP

package/libcgicc/cgicc-3.2.7-sort-undeclared.patch

@@ -1,38 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [patch] sort is now in <algorithm>
-
-When built with gcc-4.3.2, cgicc-3.2.7 cannot be compiled any more; sort
-is now being part of <algorithm> and must be written as ::sort:
-
-cardgame.cpp:1232: error: 'sort' was not declared in this scope
-make[2]: *** [cardgame.o] Error 1
-
-Fix it.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- demo/cardgame.cpp |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: cgicc-3.2.7/demo/cardgame.cpp
-===================================================================
---- cgicc-3.2.7.orig/demo/cardgame.cpp
-+++ cgicc-3.2.7/demo/cardgame.cpp
-@@ -36,6 +36,7 @@
- #include <sstream>
- #include <fstream>
- #include <queue>
-+#include <algorithm>
- 
- #include "cgicc/CgiDefs.h"
- #include "cgicc/Cgicc.h"
-@@ -1043,7 +1044,7 @@ namespace CardGameTools
- 
- 	void drawPlayerCards(datasplayer *vPlayer)
- 	{
--		sort (vPlayer->cardsList->begin(),vPlayer->cardsList->end());
-+		std::sort (vPlayer->cardsList->begin(),vPlayer->cardsList->end());
- 		cout <<"<form name=\"cards\">"; 
- 		cout <<"<input type=\"hidden\" name=\"actionner\" value=\"\">"; 
- 		cout <<"<input type=\"hidden\" name=\"card\" value=\"\">"; 

package/libcgicc/libcgicc.mk

@@ -30,16 +30,9 @@ $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked
 		--build=$(GNU_HOST_NAME) \
 		--prefix=/usr \
 		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
-		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
+		--disable-demos \
 	)
 	touch $@
 
@@ -47,12 +40,12 @@ $(LIBCGICC_DIR)/.compiled: $(LIBCGICC_DIR)/.configured
 	$(MAKE) -C $(LIBCGICC_DIR)
 	touch $@
 
-$(STAGING_DIR)/lib/libcgicc.so: $(LIBCGICC_DIR)/.compiled
+$(STAGING_DIR)/usr/lib/libcgicc.so: $(LIBCGICC_DIR)/.compiled
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBCGICC_DIR) install
-	touch -c $(STAGING_DIR)/lib/libcgicc.so
+	touch -c $(STAGING_DIR)/usr/lib/libcgicc.so
 
-$(TARGET_DIR)/usr/lib/libcgicc.so: $(STAGING_DIR)/lib/libcgicc.so
-	cp -dpf $(STAGING_DIR)/lib/libcgicc.so* $(TARGET_DIR)/usr/lib/
+$(TARGET_DIR)/usr/lib/libcgicc.so: $(STAGING_DIR)/usr/lib/libcgicc.so
+	cp -dpf $(STAGING_DIR)/usr/lib/libcgicc.so* $(TARGET_DIR)/usr/lib/
 
 libcgicc: uclibc $(TARGET_DIR)/usr/lib/libcgicc.so
 

package/libdnet/libdnet.mk

@@ -10,7 +10,12 @@ LIBDNET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/l
 LIBDNET_INSTALL_STAGING = YES
 LIBDNET_INSTALL_TARGET = YES
 LIBDNET_AUTORECONF = YES
-LIBDNET_CONF_OPT = --with-gnu-ld --enable-shared --enable-static
+LIBDNET_CONF_OPT = \
+	--with-gnu-ld \
+	--enable-shared \
+	--enable-static \
+	--with-check=no
+
 LIBDNET_DEPENDENCIES = uclibc
 
 ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),)

package/libeXosip2/Config.in

@@ -1,3 +1,6 @@
+comment "libeXosip2 has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_LIBEXOSIP2
+
 config BR2_PACKAGE_LIBEXOSIP2
 	bool "libeXosip2"
 	select BR2_PACKAGE_LIBOSIP2

package/libeXosip2/libeXosip2.mk

@@ -22,36 +22,19 @@ $(LIBEXOSIP2_DIR)/.configured: $(LIBEXOSIP2_DIR)/.unpacked
 	(cd $(LIBEXOSIP2_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
+		OSIP_CFLAGS="$(TARGET_CFLAGS)" \
+		OSIP_LIBS="-L$(STAGING_DIR)/usr/lib -losip2 -losipparser2" \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
-		--prefix=$(STAGING_DIR) \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		--libexecdir=/usr/lib \
-		--libdir=/usr/lib \
-		--includedir=$(STAGING_DIR)/usr/include \
-		--oldincludedir=/usr/include \
+		--prefix=/usr \
 		--enable-shared \
 		--enable-static \
 		$(DISABLE_NLS) \
 	)
 	touch $@
 
-#		--with-gnu-ld \
-#		--libexecdir=$(STAGING_DIR)/usr/lib \
-#		--libdir=$(STAGING_DIR)/usr/lib \
-#		--libdir=/usr/lib \
-#		--libexecdir=/usr/lib \
-
-
 $(LIBEXOSIP2_DIR)/.compiled: $(LIBEXOSIP2_DIR)/.configured
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBEXOSIP2_DIR)
 	touch $@

package/libfloat/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBFLOAT
 	bool "libfloat"
+	depends on BR2_DEPRECATED
 	help
 	 Soft floating point library.
 	

package/libglib2/libglib2.mk

@@ -14,6 +14,10 @@ LIBGLIB2_INSTALL_STAGING = YES
 LIBGLIB2_INSTALL_TARGET = YES
 LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
+# detect install prefix of host glib development stuff
+HOST_GLIB_BIN:=`dirname $(shell which glib-genmarshal || echo /usr/bin/glib-genmarshal)`
+HOST_GLIB:=$(shell dirname $(HOST_GLIB_BIN) || echo /usr)
+
 LIBGLIB2_CONF_ENV =	\
 		ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		glib_cv_uscore=no ac_cv_func_strtod=yes \
@@ -62,3 +66,10 @@ LIBGLIB2_DEPENDENCIES+=libiconv
 endif
 
 $(eval $(call AUTOTARGETS,package,libglib2))
+
+# we NEED a host glib-genmarshal
+ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+ifeq ($(wildcard $(HOST_GLIB)/bin/glib-genmarshal),)
+$(error Host glib-genmarshal not found. Please install glib development package on your host (something like libglib2.0-dev))
+endif
+endif

package/liboil/liboil.mk

@@ -26,6 +26,8 @@ ifeq ($(BR2_x86_64),y)
 LIBOIL_CONF_ENV = as_cv_unaligned_access=yes
 endif
 
+LIBOIL_CONF_OPT+=--with-gnu-ld
+
 ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
 LIBOIL_GLIB_DEP = libglib2
 endif

package/libsexy/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBSEXY
 	bool "libsexy"
 	depends on BR2_PACKAGE_LIBGTK2
-	depends on !BR2_PACKAGE_XSERVER_none
+	select BR2_PACKAGE_LIBXML2
 	help
 	  libsexy is a collection of GTK+ widgets that extend the
 	  functionality of such standard widgets as GtkEntry and
@@ -9,7 +9,3 @@ config BR2_PACKAGE_LIBSEXY
 	  limitations of the widgets.
 
 	  http://www.chipx86.com/wiki/Libsexy
-
-comment "libsexy       - disabled (requires X-Windows)"
-	depends on BR2_PACKAGE_XSERVER_none
-

package/libsexy/libsexy.mk

@@ -8,7 +8,7 @@ LIBSEXY_VERSION = 0.1.11
 LIBSEXY_SOURCE = libsexy-$(LIBSEXY_VERSION).tar.gz
 LIBSEXY_SITE = http://releases.chipx86.com/libsexy/libsexy/
 LIBSEXY_AUTORECONF = NO
-LIBSEXY_DEPENDENCIES = xlib_libX11 libgtk2
+LIBSEXY_DEPENDENCIES = libgtk2 libxml2
 LIBSEXY_INSTALL_TARGET = YES
 LIBSEXY_INSTALL_STAGING = YES
 

package/libxml2/libxml2.mk

@@ -25,6 +25,7 @@ $(eval $(call AUTOTARGETS,package,libxml2))
 $(LIBXML2_HOOK_POST_EXTRACT):
 	rm -f $(LIBXML2_DIR)/win32/Makefile.msvc.rej
 	rm -f $(LIBXML2_DIR)/macos/src/XMLTestPrefix.h.rej
+	touch $@
 
 $(LIBXML2_HOOK_POST_INSTALL):
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config

package/ltrace/Config.in

@@ -1,3 +1,6 @@
+comment "ltrace has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_LTRACE
+
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
 	#depends on BR2_LARGEFILE

package/ltt/Config.in

@@ -1,7 +0,0 @@
-config BR2_PACKAGE_LTT
-	bool "LTT (Linux Trace Toolkit)"
-	help
-	  A suite of tools designed to extract program execution
-	  details from the Linux operating system and interpret them.
-
-	  http://www.opersys.com/LTT/

package/ltt/S27tracer

@@ -1,93 +0,0 @@
-#!/bin/sh
-#
-# Load tracer module and create tracer device node.
-#
-
-MODULE="tracer"
-MAIN_DEVICE="tracer"
-USER_DEVICE="tracerU"
-GROUP="root"
-MODE="664"
-
-start() {
-	if [ -e /dev/${MAIN_DEVICE} -o -e /dev/${USER_DEVICE} ]
-	then
-	    # tell the user about what we are doing
-	    echo "Deleting old tracer nodes: /dev/tracer and /dev/tracerU"
-
-	    # remove stale nodes
-	    rm -f /dev/${MAIN_DEVICE}
-	    rm -f /dev/${USER_DEVICE}
-	fi
-
-	# look for the major number
-	MAJOR=`/bin/grep " ${MODULE}$" /proc/devices | cut -d" " -f1`
-
-	# does the device exist?
-	if [ ${MAJOR} ]
-	then
-	    echo "Found tracer device with major number:" ${MAJOR}
-	else
- 	    echo "Loading tracer kernel module: "
-	    # invoke modprobe
-	    /sbin/modprobe ${MODULE}
-	    MAJOR=`/bin/grep " ${MODULE}$" /proc/devices | cut -d" " -f1`
-	    if [ ${MAJOR} ]
-	    then
-		echo "Found tracer device with major number:" ${MAJOR}
-	    else
-		echo "Did not find tracer device ... /dev entries not created ..."
-		exit 1
-	    fi
-	fi
-
-	# tell the user about what we are doing
-	echo "Creating new tracer nodes: /dev/tracer and /dev/tracerU"
-
-	# create the character special file
-	/bin/mknod /dev/${MAIN_DEVICE} c ${MAJOR} 0
-	/bin/mknod /dev/${USER_DEVICE} c ${MAJOR} 1
-
-	# set permissions and ownership
-	/bin/chgrp ${GROUP} /dev/${MAIN_DEVICE}
-	/bin/chmod ${MODE}  /dev/${MAIN_DEVICE}
-	/bin/chgrp ${GROUP} /dev/${USER_DEVICE}
-	/bin/chmod ${MODE}  /dev/${USER_DEVICE}
-}
-stop() {
-	# tell the user about what we are doing
-	echo "Deleting tracer nodes: /dev/tracer and /dev/tracerU"
-
-	# remove nodes
-	rm -f /dev/${MAIN_DEVICE}
-	rm -f /dev/${USER_DEVICE}
-
-	if lsmod | /bin/grep "^${MODULE} "
-	then
-	    echo -n "Removing tracer kernel module: "
-	    # invoke modprobe -r
-	    /sbin/modprobe -r ${MODULE}
-	    echo "OK"
-	fi
-}
-restart() {
-	stop
-	start
-}
-
-case "$1" in
-  start)
-  	start
-	;;
-  stop)
-  	stop
-	;;
-  restart|reload)
-  	restart
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|restart}"
-	exit 1
-esac
-
-exit $?

package/ltt/ltt-gcc4.patch

@@ -1,23 +0,0 @@
---- orig/TraceToolkit-0.9.5/Visualizer/MainWindow.c	2002-04-15 19:23:49.000000000 -0700
-+++ TraceToolkit-0.9.5/Visualizer/MainWindow.c	2006-04-05 16:04:47.000000000 -0700
-@@ -28,6 +28,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <stdlib.h>
- #include <sys/stat.h>
- #include <gdk/gdkkeysyms.h>
- 
-@@ -3146,8 +3147,10 @@
- 
-   /* FORCEFULLY disconnect event handlers from the notebook widget */
-   /*  I didn't find any cleaner way to do this. K.Y. 9/5/2000 */
--  GTK_SIGNAL_FUNC(GTK_WIDGET_CLASS(GTK_OBJECT(pmSysView->Window->MNotebook)->klass)->key_press_event) = NULL,
--  GTK_SIGNAL_FUNC(GTK_WIDGET_CLASS(GTK_OBJECT(pmSysView->Window->MNotebook)->klass)->focus_in_event) = NULL,
-+  gtk_type_free(GTK_TYPE_SIGNAL, 
-+		GTK_SIGNAL_FUNC(GTK_WIDGET_CLASS(GTK_OBJECT(pmSysView->Window->MNotebook)->klass)->key_press_event));
-+  gtk_type_free(GTK_TYPE_SIGNAL,
-+		GTK_SIGNAL_FUNC(GTK_WIDGET_CLASS(GTK_OBJECT(pmSysView->Window->MNotebook)->klass)->focus_in_event));
- 
-   /* Connect the key press event */
-   gtk_signal_connect(GTK_OBJECT(pmSysView->Window->MWindow),

package/ltt/ltt.mk

@@ -1,121 +0,0 @@
-#############################################################
-#
-# ltt
-#
-#############################################################
-LTT_VERSION:=0.9.5a
-LTT_SOURCE:=TraceToolkit-$(LTT_VERSION).tgz
-LTT_SITE:=http://www.opersys.com/ftp/pub/LTT
-LTT_CAT:=$(ZCAT)
-LTT_DIR1:=$(TOOL_BUILD_DIR)/TraceToolkit-$(LTT_VERSION:a=)
-LTT_DIR2:=$(BUILD_DIR)/TraceToolkit-$(LTT_VERSION:a=)
-LTT_BINARY:=Visualizer/tracevisualizer
-LTT_TARGET_BINARY:=Daemon/tracedaemon
-
-$(DL_DIR)/$(LTT_SOURCE):
-	 $(call DOWNLOAD,$(LTT_SITE),$(LTT_SOURCE))
-
-ltt-source: $(DL_DIR)/$(LTT_SOURCE)
-
-
-#############################################################
-#
-# build tracevisualizer for use on the host system
-#
-#############################################################
-$(LTT_DIR1)/.unpacked: $(DL_DIR)/$(LTT_SOURCE)
-	$(LTT_CAT) $(DL_DIR)/$(LTT_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(LTT_DIR1) package/ltt ltt\*.patch
-	touch $(LTT_DIR1)/.unpacked
-
-# Build without GTK if not available
-LTT_WITHOUT_GTK:=$(shell which gtk-config > /dev/null 2>&1 || echo "--without-gtk")
-
-$(LTT_DIR1)/.configured: $(LTT_DIR1)/.unpacked
-	(cd $(LTT_DIR1); rm -rf config.cache; \
-		./configure \
-		--prefix=$(TOOL_BUILD_DIR) \
-		$(LTT_WITHOUT_GTK) \
-	)
-	touch $(LTT_DIR1)/.configured
-
-$(LTT_DIR1)/$(LTT_BINARY): $(LTT_DIR1)/.configured
-	$(MAKE) -C $(LTT_DIR1)/LibLTT
-	$(MAKE) -C $(LTT_DIR1)/Visualizer
-
-$(TOOL_BUILD_DIR)/bin/tracevisualizer: $(LTT_DIR1)/$(LTT_BINARY)
-	$(MAKE) -C $(LTT_DIR1)/LibLTT install
-	$(MAKE) -C $(LTT_DIR1)/Visualizer install
-
-host-ltt-tracevisualizer: $(TOOL_BUILD_DIR)/bin/tracevisualizer
-
-host-ltt-clean:
-	-$(MAKE) -C $(LTT_DIR1) clean
-
-host-ltt-dirclean:
-	rm -rf $(LTT_DIR1)
-
-
-#############################################################
-#
-# build tracedaemon for use on the target system
-#
-#############################################################
-$(LTT_DIR2)/.unpacked: $(DL_DIR)/$(LTT_SOURCE)
-	$(LTT_CAT) $(DL_DIR)/$(LTT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(LTT_DIR2) package/ltt ltt\*.patch
-	touch $(LTT_DIR2)/.unpacked
-
-$(LTT_DIR2)/.configured: $(LTT_DIR2)/.unpacked
-	(cd $(LTT_DIR2); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-	)
-	touch $(LTT_DIR2)/.configured
-
-$(LTT_DIR2)/$(LTT_TARGET_BINARY): $(LTT_DIR2)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(LTT_DIR2)/LibUserTrace
-	$(MAKE) CC=$(TARGET_CC) -C $(LTT_DIR2)/Daemon
-
-$(TARGET_DIR)/usr/bin/tracedaemon: $(LTT_DIR2)/$(LTT_TARGET_BINARY)
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \
-		-C $(LTT_DIR2)/LibUserTrace install
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \
-		-C $(LTT_DIR2)/Daemon install
-	$(STRIPCMD) $(TARGET_DIR)/usr/bin/tracedaemon > /dev/null 2>&1
-	$(INSTALL) -D -m 0755 package/ltt/S27tracer $(TARGET_DIR)/etc/init.d
-
-ltt-tracedaemon: uclibc $(TARGET_DIR)/usr/bin/tracedaemon
-
-ltt-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LTT_DIR2) uninstall
-	-$(MAKE) -C $(LTT_DIR2) clean
-
-ltt-dirclean:
-	rm -rf $(LTT_DIR2)
-
-
-ltt: host-ltt-tracevisualizer ltt-tracedaemon
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_LTT),y)
-TARGETS+=ltt
-endif

package/ltt/ltt.patch

@@ -1,42 +0,0 @@
-diff -urN TraceToolkit-0.9.5.orig/LibLTT/EventDB.c TraceToolkit-0.9.5/LibLTT/EventDB.c
---- TraceToolkit-0.9.5.orig/LibLTT/EventDB.c	2002-04-15 09:10:13.000000000 -0700
-+++ TraceToolkit-0.9.5/LibLTT/EventDB.c	2005-09-29 15:09:11.000000000 -0700
-@@ -2757,7 +2757,7 @@
- 
- 	/* Increment number of custom events */
- 	pmTraceDB->NbCustom++;
--	goto NoControlEvent;
-+	continue;
- 	break;
- 
-       /* A custom event has occured */
-@@ -2800,8 +2800,6 @@
-       lLastCtrlEvent     = lEvent;
-       lLastCtrlEventTime = lEventTime;
-       }
--
--NoControlEvent:
-     } while(DBEventNext(pmTraceDB, &lEvent) == TRUE);
- 
-   /* Remember the last event and its time */
-diff -urN TraceToolkit-0.9.5.orig/LibLTT/RTAIDB.c TraceToolkit-0.9.5/LibLTT/RTAIDB.c
---- TraceToolkit-0.9.5.orig/LibLTT/RTAIDB.c	2002-04-15 20:00:05.000000000 -0700
-+++ TraceToolkit-0.9.5/LibLTT/RTAIDB.c	2005-09-29 15:09:17.000000000 -0700
-@@ -2621,7 +2621,7 @@
- 
- 	/* Increment number of custom events */
- 	pmTraceDB->NbCustom++;
--	goto NoControlEvent;
-+	continue;
- 	break;
- 
-       /* A custom event has occured */
-@@ -2936,8 +2936,6 @@
-       lLastCtrlEvent     = lEvent;
-       lLastCtrlEventTime = lEventTime;
-       }
--
--NoControlEvent:
-     } while(DBEventNext(pmTraceDB, &lEvent) == TRUE);
- 
-   /* Remember the last event and it's time */

package/lua/Config.in

@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUA
 	bool "lua"
-	select BR2_READLINE
+	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_NCURSES
 	help
 	  Lua is a powerful, fast, light-weight, embeddable scripting language.

package/microperl/microperl.mk

@@ -23,18 +23,38 @@ $(DL_DIR)/$(MICROPERL_SOURCE):
 
 $(MICROPERL_DIR)/.source: $(DL_DIR)/$(MICROPERL_SOURCE)
 	$(MICROPERL_CAT) $(DL_DIR)/$(MICROPERL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	chmod -R u+w $(MICROPERL_DIR)
 	touch $@
 
-$(MICROPERL_DIR)/.configured: $(MICROPERL_DIR)/.source
-ifeq ($(BR2_PACKAGE_AUTOMAKE),y)
+$(MICROPERL_DIR)/.host_configured: $(MICROPERL_DIR)/.source
 	# we need to build a perl for the host just for Errno.pm
-	(cd $(MICROPERL_DIR); ./Configure -de; \
-	 $(MAKE) CC="$(HOSTCC)"; \
-	 $(SHELL) ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))"; \
+	(cd $(MICROPERL_DIR); ./Configure -Dcc=$(HOSTCC) -de  )
+	touch $@
+
+
+$(MICROPERL_DIR)/.host_configured_and_fixed: $(MICROPERL_DIR)/.host_configured
+	$(SED) 's/^.*<command-line>.*//g' $(MICROPERL_DIR)/makefile
+	$(SED) 's/^.*<command-line>.*//g' $(MICROPERL_DIR)/x2p/makefile
+	touch $@
+
+$(MICROPERL_DIR)/.host_make: $(MICROPERL_DIR)/.host_configured_and_fixed
+	$(MAKE) -C $(MICROPERL_DIR)		|| echo "An error is expected on make"
+	touch $@
+
+$(MICROPERL_DIR)/.host_make_fixed: $(MICROPERL_DIR)/.host_make
+	$(SED) 's#^.*<asm/page.h>.*##g' $(MICROPERL_DIR)/ext/IPC/SysV/SysV.c
+	$(MAKE) -C $(MICROPERL_DIR) test	|| echo "An error is expected on make test"
+	touch $@
+
+$(MICROPERL_DIR)/.configured: $(MICROPERL_DIR)/.host_make_fixed
+	# we need to build a perl for the host just for Errno.pm
+	(cd $(MICROPERL_DIR); \
+	 chmod a+x ext/util/make_ext; \
+	 ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))" \
 	)
-endif
-	(cd $(MICROPERL_DIR); chmod u+w uconfig.h; . ./uconfig.sh; \
-	 $(MAKE) -f Makefile.micro regen_uconfig; \
+	(cd $(MICROPERL_DIR); \
+	 chmod u+w uconfig.h; ./uconfig.sh; \
+	 $(MAKE) -f $(MICROPERL_DIR)/Makefile.micro regen_uconfig; \
 	 $(SED) 's,PRIVLIB ".*,PRIVLIB "/$(MICROPERL_MODS_DIR)",' \
 		 -e 's,PRIVLIB_EXP ".*,PRIVLIB_EXP "$(MICROPERL_MODS_DIR)",' \
 		 -e 's,BIN ".*,BIN "/usr/bin",' \
@@ -43,7 +63,7 @@ endif
 	touch $@
 
 $(MICROPERL_DIR)/microperl: $(MICROPERL_DIR)/.configured
-	$(MAKE) -f Makefile.micro CC=$(TARGET_CC) \
+	$(MAKE) -f $(MICROPERL_DIR)/Makefile.micro CC=$(TARGET_CC) \
 		OPTIMIZE="$(TARGET_CFLAGS)" -C $(MICROPERL_DIR)
 ifeq ($(BR2_PACKAGE_AUTOMAKE),y)
 	#(cd $(@D); \
@@ -58,17 +78,28 @@ ifneq ($(MICROPERL_MODS),)
 		[ -d $$i ] || mkdir -p $$i; \
 	 done; \
 	 for i in $(MICROPERL_MODS); do \
-	 cp -dpf lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
+	 cp -dpf $(MICROPERL_DIR)/lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
 	 done; \
 	)
 endif
-	cp -dpf $(MICROPERL_DIR)/microperl $(TARGET_DIR)/usr/bin/microperl
+	cp -dpf $(MICROPERL_DIR)/microperl $@
+ifneq ($(BR2_STRIP_none),y)
+	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
+endif
 	(cd $(TARGET_DIR)/usr/bin; rm -f perl; ln -s microperl perl;)
 
 microperl: uclibc $(TARGET_DIR)/usr/bin/microperl
 
 microperl-source: $(DL_DIR)/$(MICROPERL_SOURCE)
 
+microperl-unpacked: $(MICROPERL_DIR)/.source
+
+microperl-config: $(MICROPERL_DIR)/.host_configured
+
+microperl-host: $(MICROPERL_DIR)/.host_make
+
+microperl-host-fixed: $(MICROPERL_DIR)/.host_make_fixed
+
 microperl-clean:
 	rm -rf $(TARGET_DIR)/usr/bin/microperl \
 		$(TARGET_DIR)/$(MICROPERL_MODS_DIR) $(TARGET_DIR)/usr/bin/perl

package/modutils/Config.in

@@ -1,6 +1,7 @@
 config BR2_PACKAGE_MODUTILS
 	bool "modutils"
 	depends on !BR2_PACKAGE_MODULE_INIT_TOOLS
+	depends on BR2_DEPRECATED
 	help
 	  The modutils packages includes the kerneld program for automatic
 	  loading and unloading of modules, as well as other module

package/mpfr/mpfr.mk

@@ -3,8 +3,8 @@
 # mpfr
 #
 #############################################################
-MPFR_VERSION:=2.3.0
-MPFR_PATCH:=patches
+MPFR_VERSION:=2.3.2
+#MPFR_PATCH:=patches
 MPFR_PATCH_FILE:=mpfr-$(MPFR_VERSION).patch
 MPFR_SOURCE:=mpfr-$(MPFR_VERSION).tar.bz2
 MPFR_CAT:=$(BZCAT)
@@ -13,8 +13,7 @@ MPFR_DIR:=$(TOOL_BUILD_DIR)/mpfr-$(MPFR_VERSION)
 MPFR_TARGET_DIR:=$(BUILD_DIR)/mpfr-$(MPFR_VERSION)
 MPFR_BINARY:=libmpfr$(LIBTGTEXT)
 MPFR_HOST_BINARY:=libmpfr$(HOST_SHREXT)
-MPFR_LIBVERSION:=1.0.1
-#MPFR_SVN_CMD:=svn co svn://scm.gforge.inria.fr/svn/mpfr/branches/2.3 mpfr-2.3
+MPFR_LIBVERSION:=1.1.2
 
 # need patch
 ifneq ($(MPFR_PATCH),)
@@ -97,7 +96,7 @@ $(MPFR_DIR2)/.configured: $(MPFR_DIR)/.unpacked $(GMP_HOST_DIR)/lib/$(GMP_HOST_B
 		--prefix="$(MPFR_HOST_DIR)" \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
-		--enable-shared \
+		--disable-shared \
 		--enable-static \
 		--with-gmp=$(GMP_HOST_DIR) \
 		$(DISABLE_NLS) \

package/multimedia/alsa-lib/Config.in

@@ -9,7 +9,7 @@ config BR2_PACKAGE_ALSA_LIB
 config BR2_PACKAGE_ALSA_LIB_PYTHON
 	bool "Python support for alsa-lib"
 	depends on BR2_PACKAGE_ALSA_LIB
-	select BR2_PACKAGE_PYTHON
+	depends on BR2_PACKAGE_PYTHON
 	help
 	  Add python support for alsa-lib.
 	  Python will be built and libpython will be installed

package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch

@@ -0,0 +1,91 @@
+diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h alsa-lib-1.0.18/src/pcm/pcm_local.h
+--- alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h	2009-01-31 11:02:12.000000000 +0100
++++ alsa-lib-1.0.18/src/pcm/pcm_local.h	2009-01-31 11:03:24.000000000 +0100
+@@ -611,6 +611,13 @@
+ 			   snd_pcm_hw_param_t var);
+ int _snd_pcm_hw_param_set(snd_pcm_hw_params_t *params,
+ 			  snd_pcm_hw_param_t var, unsigned int val, int dir);
++
++#if	defined(AVR32_INLINE_BUG)
++int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
++						snd_pcm_format_t val);
++int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
++				     snd_pcm_subformat_t val);
++#else
+ static inline int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
+ 						snd_pcm_format_t val)
+ {
+@@ -624,7 +631,7 @@
+ 	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
+ 				     (unsigned long) val, 0);
+ }
+-
++#endif
+ int _snd_pcm_hw_param_set_min(snd_pcm_hw_params_t *params,
+ 			      snd_pcm_hw_param_t var, unsigned int val, int dir);
+ int _snd_pcm_hw_param_set_max(snd_pcm_hw_params_t *params,
+diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c alsa-lib-1.0.18/src/pcm/pcm_route.c
+--- alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c	2009-01-31 11:02:12.000000000 +0100
++++ alsa-lib-1.0.18/src/pcm/pcm_route.c	2009-01-31 11:03:18.000000000 +0100
+@@ -26,6 +26,7 @@
+  *
+  */
+   
++
+ #include <byteswap.h>
+ #include <math.h>
+ #include "pcm_local.h"
+@@ -106,6 +107,23 @@
+ 
+ #endif /* DOC_HIDDEN */
+ 
++
++#if	defined(AVR32_INLINE_BUG)
++int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
++						snd_pcm_format_t val)
++{
++	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_FORMAT,
++				     (unsigned long) val, 0);
++}
++
++int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
++				     snd_pcm_subformat_t val)
++{
++	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
++				     (unsigned long) val, 0);
++}
++#endif
++
+ static void snd_pcm_route_convert1_zero(const snd_pcm_channel_area_t *dst_area,
+ 					snd_pcm_uframes_t dst_offset,
+ 					const snd_pcm_channel_area_t *src_areas ATTRIBUTE_UNUSED,
+@@ -483,6 +501,8 @@
+ 				  snd_pcm_uframes_t frames,
+ 				  snd_pcm_route_params_t *params)
+ {
++#if	defined(AVR32_INLINE_BUG)
++#endif
+ 	unsigned int dst_channel;
+ 	snd_pcm_route_ttable_dst_t *dstp;
+ 	const snd_pcm_channel_area_t *dst_area;
+@@ -551,8 +571,20 @@
+ 	_snd_pcm_hw_param_set_mask(sparams, SND_PCM_HW_PARAM_ACCESS,
+ 				   &saccess_mask);
+ 	if (route->sformat != SND_PCM_FORMAT_UNKNOWN) {
++#if	defined(AVR32_INLINE_BUG)
++/* Start of  of problem */
++#endif
+ 		_snd_pcm_hw_params_set_format(sparams, route->sformat);
+ 		_snd_pcm_hw_params_set_subformat(sparams, SND_PCM_SUBFORMAT_STD);
++#if	0
++		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_FORMAT,
++				     (unsigned long) route->sformat, 0);
++		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_SUBFORMAT,
++				     (unsigned long) SND_PCM_SUBFORMAT_STD, 0);
++#endif
++#if	defined(AVR32_INLINE_BUG)
++/* End of problem */
++#endif
+ 	}
+ 	if (route->schannels >= 0) {
+ 		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_CHANNELS,

package/multimedia/alsa-lib/alsa-lib-1.0.18-fix-off_t-in-kernel-struct.patch

@@ -0,0 +1,30 @@
+From c821f2e7f2534ece24a10402df3f501536a09cbd Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 28 Jan 2009 15:00:35 +0100
+Subject: [PATCH] Fix off_t in kernel struct
+
+The off_t in kernel struct (for ioctls) is actually different from the
+definition of user-space off_t.  The kernel off_t is equial with long
+while user-space off_t depends on the large-file support.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ include/sound/asound.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/sound/asound.h b/include/sound/asound.h
+index 977b2d6..62d1e57 100644
+--- a/include/sound/asound.h
++++ b/include/sound/asound.h
+@@ -402,7 +402,7 @@ struct sndrv_pcm_sw_params {
+ 
+ struct sndrv_pcm_channel_info {
+ 	unsigned int channel;
+-	off_t offset;			/* mmap offset */
++	long offset;			/* mmap offset */
+ 	unsigned int first;		/* offset to first sample in bits */
+ 	unsigned int step;		/* samples distance in bits */
+ };
+-- 
+1.5.6.5
+

package/multimedia/alsa-lib/alsa-lib.mk

@@ -11,14 +11,19 @@ ALSA_LIB_CAT:=$(BZCAT)
 ALSA_LIB_BINARY:=libasound.so.2.0.0
 ALSA_LIB_TARGET_BINARY:=usr/lib/$(ALSA_LIB_BINARY)
 
+ALSA_LIB_CFLAGS=$(TARGET_CFLAGS)
+
 ifeq ($(BR2_arm),y)
-ALSA_LIB_ABI:=-mabi=aapcs-linux
-else
-ALSA_LIB_ABI:=
+ALSA_LIB_CFLAGS+=-mabi=aapcs-linux
+endif
+
+ifeq ($(BR2_avr32),y)
+ALSA_LIB_CFLAGS+=-DAVR32_INLINE_BUG
 endif
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
 ALSA_LIB_CONFIGURE_OPTS += --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR)
+ALSA_LIB_CFLAGS+=-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
 ALSA_LIB_DEPS = libpython
 else
 ALSA_LIB_CONFIGURE_OPTS += --disable-python
@@ -41,7 +46,7 @@ $(ALSA_LIB_DIR)/.configured: $(ALSA_LIB_DIR)/.unpacked
 	(cd $(ALSA_LIB_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) $(ALSA_LIB_ABI)" \
+		CFLAGS="$(ALSA_LIB_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS) -lm" \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
@@ -77,7 +82,9 @@ $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY): $(STAGING_DIR)/$(ALSA_LIB_TARGET_BINARY
 
 alsa-lib: uclibc $(ALSA_LIB_DEPS) $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)
 
-alsa-lib-source: $(DL_DIR)/$(ALSA-LIB_SOURCE)
+alsa-lib-unpacked: $(ALSA_LIB_DIR)/.unpacked
+
+alsa-lib-source: $(DL_DIR)/$(ALSA_LIB_SOURCE)
 
 alsa-lib-clean:
 	rm -f $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)

package/multimedia/asterisk/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ASTERISK
 	bool "asterisk"
+	depends on BROKEN
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_ZLIB
 	depends on BR2_PACKAGE_OPENSSL
@@ -10,3 +11,4 @@ config BR2_PACKAGE_ASTERISK
 comment "asterisk	- disabled (required openssl and mpg123)"
 	depends on !BR2_PACKAGE_OPENSSL || ! BR2_PACKAGE_MPG123
 
+

package/multimedia/asterisk/asterisk_no_res_ninit.patch

@@ -1,12 +0,0 @@
-diff -ur /tmp/asterisk-1.2.0-beta1/dns.c asterisk-1.2.0-beta1/dns.c
---- /tmp/asterisk-1.2.0-beta1/dns.c	2005-08-14 04:23:33.000000000 +0200
-+++ asterisk-1.2.0-beta1/dns.c	2005-08-31 09:42:36.000000000 +0200
-@@ -157,7 +157,7 @@
- 	return 0;
- }
- 
--#if defined(res_ninit)
-+#if (defined(res_ninit) && !defined(__UCLIBC__))
- #define HAS_RES_NINIT
- #else
- AST_MUTEX_DEFINE_STATIC(res_lock);

package/multimedia/libvorbis/libvorbis.mk

@@ -108,7 +108,8 @@ $(TREMOR_DIR)/.libs: $(TREMOR_DIR)/.configured
 	touch $@
 
 $(TARGET_DIR)/usr/lib/tremor.so: $(TREMOR_DIR)/.libs
-	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(TREMOR_DIR) install
+	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(TREMOR_DIR) \
+		$(if $(BR2_STRIP_none),install,install-strip)
 	touch $@
 
 $(TARGET_DIR)/usr/lib/tremor.a: $(TARGET_DIR)/usr/lib/tremor.so

package/multimedia/mpg123/Config.in

@@ -5,8 +5,3 @@ config BR2_PACKAGE_MPG123
 	  MPEG 1.0/2.0 layers 1, 2 and 3.
 
 	  http://www.mpg123.de/
-
-config BR2_PACKAGE_MPG123_ALSA
-	bool
-	default y
-	depends on BR2_PACKAGE_ALSA_LIB

package/multimedia/mpg123/mpg123-0.59r-cross.patch

@@ -1,44 +0,0 @@
-diff -ruN mpg123-0.59r.orig/Makefile mpg123-0.59r/Makefile
---- mpg123-0.59r.orig/Makefile	1999-06-15 22:39:06.000000000 +0200
-+++ mpg123-0.59r/Makefile	2006-12-14 15:52:44.000000000 +0100
-@@ -103,14 +103,14 @@
-         mpg123-make
- 
- linux:
--	$(MAKE) CC=gcc LDFLAGS= \
-+	$(MAKE) LDFLAGS= \
- 		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
- 			audio_oss.o term.o' \
- 		CFLAGS='-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
- 			-DREAD_MMAP -DOSS -DTERM_CONTROL\
--			-Wall -O2 -m486 \
-+			-Wall \
- 			-fomit-frame-pointer -funroll-all-loops \
--			-finline-functions -ffast-math' \
-+			-finline-functions -ffast-math $(CFLAGS)' \
- 		mpg123-make
- 
- linux-3dnow:
-@@ -246,6 +246,22 @@
- 			-finline-functions -ffast-math' \
- 		mpg123-make
- 
-+linux-bigend:
-+	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-+		CFLAGS+='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \
-+			-DOSS -DOSS_BIG_ENDIAN -Wall \
-+			-fomit-frame-pointer -funroll-loops \
-+			-finline-functions -ffast-math $(CFLAGS)' \
-+		mpg123-make
-+
-+linux-littleend:
-+	$(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
-+		CFLAGS='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \
-+			-DOSS -Wall \
-+			-fomit-frame-pointer -funroll-loops \
-+			-finline-functions -ffast-math $(CFLAGS)' \
-+		mpg123-make
-+
- linux-sajber:
- 	@ $(MAKE) FRONTEND=sajberplay-make linux-frontend
- 

package/multimedia/mpg123/mpg123.mk

@@ -13,7 +13,7 @@ MPG123_TARGET_BIN:=usr/bin/mpg123
 
 # Check if ALSA is built, then we should configure after alsa-lib so
 # ./configure can find alsa-lib.
-ifeq ($(BR2_PACKAGE_MPG123_ALSA),y)
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
 MPG123_USE_ALSA:=--with-audio=alsa
 MPG123_ALSA_DEP:=alsa-lib
 endif
@@ -55,6 +55,8 @@ $(TARGET_DIR)/$(MPG123_TARGET_BIN): $(MPG123_DIR)/$(MPG123_BIN)
 
 mpg123: uclibc $(MPG123_ALSA_DEP) $(TARGET_DIR)/$(MPG123_TARGET_BIN)
 
+mpg123-unpacked: $(MPG123_DIR)/.unpacked
+
 mpg123-clean:
 	-$(MAKE) -C $(MPG123_DIR) clean
 

package/multimedia/mplayer/mplayer-1.0rc1-remove-sys-timeb.patch

@@ -0,0 +1,12 @@
+win32.c:67:23: error: sys/timeb.h: No such file or directory
+
+--- a/loader/win32.c	2009-01-26 01:53:20.000000000 +0100
++++ b/loader/win32.c	2009-01-26 01:53:39.000000000 +0100
+@@ -64,7 +64,6 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <sys/time.h>
+-#include <sys/timeb.h>
+ #ifdef	HAVE_KSTAT
+ #include <kstat.h>
+ #endif

package/multimedia/mplayer/mplayer.mk

@@ -25,6 +25,11 @@ else
 MPLAYER_LARGEFILE:=--disable-largefiles
 endif
 
+ifeq ($(BR2_i386),y)
+# This seems to be required to compile some of the inline asm
+MPLAYER_CFLAGS:=-fomit-frame-pointer
+endif
+
 $(DL_DIR)/$(MPLAYER_SOURCE):
 	$(call DOWNLOAD,$(MPLAYER_SITE),$(MPLAYER_SOURCE))
 
@@ -38,7 +43,7 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
 	(cd $(MPLAYER_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		CFLAGS="$(TARGET_CFLAGS) $(MPLAYER_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
 		./configure \
 		--prefix=/usr \

package/ncftp/Config.in

@@ -32,9 +32,11 @@ config BR2_PACKAGE_NCFTP_BATCH
 config BR2_PACKAGE_NCFTP_SPOOLER
 	bool "NcFTPSpooler - spooler - not working properly"
 	depends on BR2_PACKAGE_NCFTP
+	depends on BR2_PACKAGE_NCURSES
 
 config BR2_PACKAGE_NCFTP_BOOKMARKS
-	bool "NcFTPBookmarks - not working properly"
+	bool "NcFTPBookmarks"
 	depends on BR2_PACKAGE_NCFTP
+	depends on BR2_PACKAGE_NCURSES
 
 endmenu

package/ncftp/ncftp.mk

@@ -26,15 +26,20 @@ ifeq ($(BR2_PACKAGE_NCFTP_BATCH),y)
 NCFTP_TARGET_BINS+=ncftpbatch
 endif
 
+ifeq ($(BR2_PACKAGE_NCURSES),y)
 ifeq ($(BR2_PACKAGE_NCFTP_SPOOLER),y)
 #Someone needs to figure out what to do...
 NCFTP_TARGET_BINS+=
 endif
 
+# only set if NCURSES is available
 ifeq ($(BR2_PACKAGE_NCFTP_BOOKMARKS),y)
 NCFTP_TARGET_BINS+=ncftpbookmarks
 endif
 
+NCFTP_DEPS += ncurses
+endif
+
 ncftp-source: $(DL_DIR)/$(NCFTP_SOURCE)
 
 $(DL_DIR)/$(NCFTP_SOURCE):
@@ -64,7 +69,7 @@ $(TARGET_DIR)/usr/bin/ncftp $(TARGET_DIR)/usr/bin/ncftp%: $(addprefix $(NCFTP_DI
 	$(INSTALL) -m 0755 $(NCFTP_DIR)/bin/$(notdir $@) $(TARGET_DIR)/usr/bin
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
 
-ncftp: uclibc $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS))
+ncftp: uclibc $(NCFTP_DEPS) $(addprefix $(TARGET_DIR)/usr/bin/, $(NCFTP_TARGET_BINS))
 
 ncftp-clean:
 	-$(MAKE) -C $(NCFTP_DIR) clean

package/ncurses/ncurses.mk

@@ -130,7 +130,9 @@ endif
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
 	touch -c $@
 
-$(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a
+$(NCURSES_DIR)/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.so.$(NCURSES_VERSION)
+
+$(TARGET_DIR)/usr/lib/libncurses.a: $(NCURSES_DIR)/lib/libncurses.a
 	mkdir -p $(TARGET_DIR)/usr/include
 	cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/curses.h
 	cp -dpf $(NCURSES_DIR)/include/ncurses_dll.h $(TARGET_DIR)/usr/include/ncurses_dll.h

package/ntfs-3g/Config.in

@@ -1,3 +1,6 @@
+comment "ntfs-3g has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_NTFS_3G
+
 config BR2_PACKAGE_NTFS-3G
         bool "ntfs-3g"
 	select BR2_PACKAGE_PKGCONFIG

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

@@ -0,0 +1,33 @@
+https://support.ntp.org/bugs/show_bug.cgi?id=769
+http://bugs.gentoo.org/254030
+
+--- ntp/util/tickadj.c
++++ ntp/util/tickadj.c
+@@ -21,7 +21,8 @@
+ # include <unistd.h>
+ #endif /* HAVE_UNISTD_H */
+ 
+-#ifdef HAVE___ADJTIMEX		/* Linux */
++/* proper handling here has been moved to upstream ntp bugzilla */
++#ifdef linux
+ 
+ #include <sys/timex.h>
+ struct timex txc;
+@@ -91,7 +92,7 @@
+ 	}
+ 
+ 	if (!errflg) {
+-		if (__adjtimex(&txc) < 0)
++		if (adjtimex(&txc) < 0)
+ 			perror("adjtimex");
+ 		else if (!quiet)
+ 			printf("tick     = %ld\ntick_adj = %d\n",
+@@ -146,7 +147,7 @@
+ #endif
+ 	}
+     
+-	if (__adjtimex(&txc) < 0)
++	if (adjtimex(&txc) < 0)
+ 	{
+ 		perror("adjtimex");
+ 	}

package/openntpd/Config.in

@@ -1,3 +1,6 @@
+comment "OpenNTPD has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_OPENNTPD
+
 config BR2_PACKAGE_OPENNTPD
 	bool "OpenNTPD"
 	help

package/openvpn/Config.in

@@ -1,3 +1,6 @@
+comment "openvpn has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_OPENVPN
+
 config BR2_PACKAGE_OPENVPN
 	bool "openvpn"
 	select BR2_PACKAGE_LZO

package/oprofile/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_OPROFILE
 	bool "oprofile"
 	select BR2_PACKAGE_POPT
-	select BR2_INSTALL_LIBSTDCPP
+	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  OProfile is a system-wide profiler for Linux systems,
 	  capable of profiling all running code at low overhead.
@@ -17,3 +17,6 @@ config BR2_PACKAGE_OPROFILE
 	  profiling. All code is profiled: hardware and software
 	  interrupt handlers, kernel modules, the kernel, shared
 	  libraries, and applications.
+
+comment "oprofile requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP

package/pciutils/Config.in

@@ -1,3 +1,6 @@
+comment "pciutils has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_PCIUTILS
+
 config BR2_PACKAGE_PCIUTILS
 	bool "pciutils"
 	help

package/php/Config.ext

@@ -86,7 +86,7 @@ config BR2_PACKAGE_PHP_EXT_JSON
 
 config BR2_PACKAGE_PHP_EXT_READLINE
 	bool "readline"
-	depends on BR2_PACKAGE_PHP && (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_READLINE
+	depends on BR2_PACKAGE_PHP && (BR2_PACKAGE_PHP_CLI || BR2_PACKAGE_PHP_CGI) && BR2_PACKAGE_READLINE
 	help
 	  readline support
 

package/php/php.mk

@@ -87,7 +87,7 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y)
 	PHP_DEPS+=readline
 endif
 ifeq ($(BR2_PACKAGE_PHP_EXT_NCURSES),y)
-	PHP_CONFIGURE+=--with-ncurses=$(STATING_DIR)/usr
+	PHP_CONFIGURE+=--with-ncurses=$(STAGING_DIR)/usr
 	PHP_DEPS+=ncurses
 endif
 ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVMSG),y)
@@ -132,6 +132,8 @@ php-source: $(DL_DIR)/$(PHP_SOURCE)
 
 $(PHP_DIR)/.unpacked: $(DL_DIR)/$(PHP_SOURCE)
 	$(PHP_CAT) $(DL_DIR)/$(PHP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(PHP_DIR) package/php/ php\*.patch
+	toolchain/patch-kernel.sh $(PHP_DIR) package/php/ php\*.patch.$(ARCH)
 	touch $@
 
 $(PHP_DIR)/.configured: $(PHP_DIR)/.unpacked
@@ -184,6 +186,8 @@ $(TARGET_DIR)/etc/php.ini: $(PHP_DIR)/.staged
 
 php: uclibc $(PHP_DEPS) $(PHP_TARGET_DEPS) $(TARGET_DIR)/etc/php.ini
 
+php-unpacked: $(PHP_DIR)/.unpacked
+
 php-clean:
 	rm -f $(PHP_DIR)/.configured $(PHP_DIR)/.built $(PHP_DIR)/.staged
 	rm -f $(PHP_TARGET_DEPS)

package/popt/popt.mk

@@ -5,9 +5,15 @@
 #############################################################
 POPT_VERSION:=1.14
 POPT_SITE:=http://rpm5.org/files/popt
-POPT_INSTALL_STAGING:=YES
-POPT_INSTALL_TARGET:=YES
-POPT_CONF_ENV:=ac_cv_va_copy=yes
+POPT_INSTALL_STAGING = YES
+POPT_INSTALL_TARGET = YES
+
+POPT_CONF_ENV = ac_cv_va_copy=yes
+
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+POPT_CONF_ENV += am_cv_lib_iconv=yes
+POPT_CONF_OPT += --with-libiconv-prefix=$(STAGING_DIR)/usr
+endif
 
 POPT_DEPENDENCIES:=uclibc
 

package/python/python.mk

@@ -17,7 +17,7 @@ PYTHON_SITE_PACKAGE_DIR=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site
 BR2_PYTHON_DISABLED_MODULES=dbm zipfile
 
 ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y)
-PYTHON_DEPS += readline-target
+PYTHON_DEPS += readline
 else
 BR2_PYTHON_DISABLED_MODULES += readline
 endif

package/qte/Config.in

@@ -1,8 +1,8 @@
 config BR2_PACKAGE_QTE
 	bool "Qt/E"
 	depends on BR2_DEPRECATED
-	select BR2_INSTALL_LIBSTDCPP
-	select BR2_PTHREADS_NATIVE
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PTHREADS_NATIVE
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBPNG
 	help
@@ -14,6 +14,11 @@ config BR2_PACKAGE_QTE
 	  Only tested with threading on, PACKAGE_JPEG, PACKAGE_LIBPNG,
 	  but remove those if you like.
 
+comment "Qt/E requires a toolchain with C++ support enabled and native threading enabled (NPTL)"
+	depends on !BR2_INSTALL_LIBSTDCPP
+	depends on BR2_DEPRECATED
+	depends on !BR2_PTHREADS_NATIVE
+
 config BR2_PACKAGE_QTE_COMMERCIAL_USERNAME
 	string "Qt/E Commercial License Username"
 	default ""

package/qtopia4/Config.in

@@ -1,12 +1,15 @@
 config BR2_PACKAGE_QTOPIA4
 	bool "qtopia4"
-	select BR2_INSTALL_LIBSTDCPP
+	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PTHREADS_NATIVE
 	help
 	  Qtopia core 4.
 
 	  http://www.trolltech.com/
 
+comment "qtopia4 requires a toolchain with C++ support enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
 if BR2_PACKAGE_QTOPIA4
 
 config BR2_PACKAGE_QTOPIA4_DEBUG
@@ -86,12 +89,46 @@ config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
 	  library with proxy code and increase the space required on target.
 	  If unsure say n.
 
-config BR2_PACKAGE_QTOPIA4_DEPTHS
-	string "color depths to support"
-	default "-depths 24,16,8"
-	help
-	  Which color depths to support for the library. Default is "-depths
-	  24,16,8". Different depths are specified by a comma separated list.
+menu "Pixel depths"
+comment "Deselecting each option leads to Qt's default (8,16,32)"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL
+	bool "All supported depths"
+
+if !BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_1
+	bool "1 bpp, black/white"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_4
+	bool "4 bpp, grayscale"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_8
+	bool "8 bpp, paletted"
+	default y
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_12
+	bool "12 bpp, rgb 4-4-4"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_15
+	bool "15 bpp, rgb 5-5-5"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_16
+	bool "16 bpp, rgb 5-6-5"
+	default y
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_18
+	bool "18 bpp, rgb 6-6-6"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_24
+	bool "24 bpp, rgb 8-8-8"
+
+config BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_32
+	bool "32 bpp, argb 8-8-8-8 and rgb 8-8-8"
+	default y
+
+endif
+endmenu
 
 config BR2_PACKAGE_QTOPIA4_GIF
 	bool "Enable GIF support"

package/qtopia4/qtopia4.mk

@@ -66,6 +66,42 @@ QTOPIA4_CONFIGURE+= -no-qt3support
 endif
 
 
+### Pixel depths
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL),y)
+QTOPIA4_PIXEL_DEPTHS = all
+else
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_1),y)
+QTOPIA4_PIXEL_DEPTHS += 1
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_4),y)
+QTOPIA4_PIXEL_DEPTHS += 4
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_8),y)
+QTOPIA4_PIXEL_DEPTHS += 8
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_12),y)
+QTOPIA4_PIXEL_DEPTHS += 12
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_15),y)
+QTOPIA4_PIXEL_DEPTHS += 15
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_16),y)
+QTOPIA4_PIXEL_DEPTHS += 16
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_18),y)
+QTOPIA4_PIXEL_DEPTHS += 18
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_24),y)
+QTOPIA4_PIXEL_DEPTHS += 24
+endif
+ifeq ($(BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_32),y)
+QTOPIA4_PIXEL_DEPTHS += 32
+endif
+endif
+ifneq ($(QTOPIA4_PIXEL_DEPTHS),)
+QTOPIA4_CONFIGURE += -depths $(subst $(space),$(comma),$(strip $(QTOPIA4_PIXEL_DEPTHS)))
+endif
+
 ### Display drivers
 ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_LINUXFB),y)
 QTOPIA4_CONFIGURE += -qt-gfx-linuxfb
@@ -310,8 +346,8 @@ ifneq ($(BR2_INET_IPV6),y)
 	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure
 endif
 	$(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
-	#$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
-        # Fix compiler path
+	#$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_QMAKE_CONF)
+	# Fix compiler path
 	$(SED) '\,QMAKE_CC[ 	]*=, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_QMAKE_CONF)
 	$(SED) '\,QMAKE_CXX[ 	]*=, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF)
 	$(SED) '\,QMAKE_LINK[ 	]*=, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF)

package/radvd/Config.in

@@ -0,0 +1,8 @@
+config BR2_PACKAGE_RADVD
+	bool "radvd"
+	select BR2_PACKAGE_FLEX
+	depends on BR2_INET_IPV6
+	help
+	  IPv6 Router Advertisement Daemon.
+
+	  http://www.litech.org/radvd/

package/radvd/S50radvd

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+RADVD=/usr/sbin/radvd
+
+echo "1" > /proc/sys/net/ipv6/conf/all/forwarding
+
+echo -n "Starting radvd: "
+if [ ! -x "${RADVD}" ]; then
+	echo "missing"
+	exit 1
+fi
+
+if ${RADVD} ; then
+	echo "done"
+else
+	echo "failed"
+	exit 1
+fi

package/radvd/radvd.mk

@@ -0,0 +1,20 @@
+#############################################################
+#
+# radvd
+#
+#############################################################
+RADVD_VERSION:=1.2
+RADVD_SOURCE:=radvd-$(RADVD_VERSION).tar.gz
+RADVD_SITE:=http://www.litech.org/radvd/dist/
+RADVD_AUTORECONF:=no
+RADVD_INSTALL_STAGING:=no
+RADVD_INSTALL_TARGET:=YES
+RADVD_DEPENDENCIES:=uclibc flex
+RADVD_MAKE:=$(MAKE1)
+RADVD_CONF_OPT:= --program-prefix=''
+
+$(eval $(call AUTOTARGETS,package,radvd))
+
+$(RADVD_HOOK_POST_INSTALL): $(RADVD_TARGET_INSTALL_TARGET)
+	$(INSTALL) -m 0755 package/radvd/S50radvd $(TARGET_DIR)/etc/init.d
+	touch $@

package/readline/Config.in

@@ -1,18 +1,5 @@
 #
-config BR2_READLINE
+config BR2_PACKAGE_READLINE
 	bool "readline"
 	help
 	    Enable GNU readline support?
-
-config BR2_PACKAGE_READLINE_TARGET
-	bool "readline for the target"
-	depends on BR2_READLINE
-	help
-	  Say yes here to install the readline libraries on the target.
-
-config BR2_PACKAGE_READLINE_HEADERS
-	bool "readline headers for the target"
-	depends on BR2_PACKAGE_READLINE_TARGET
-	help
-	  Say yes here to install the readline headers and documentation
-	  on the target.

package/readline/readline.mk

@@ -75,27 +75,17 @@ $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY): $(READLINE_DIR)/$(READLINE_BINAR
 		-C $(READLINE_DIR) install-shared uninstall-doc
 	chmod 775 $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
 	$(STRIPCMD) $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)
-ifneq ($(BR2_PACKAGE_READLINE_HEADERS),y)
-	rm -rf $(TARGET_DIR)/usr/include/readline
-endif
 
-readline: ncurses $(STAGING_DIR)/usr/include/readline/readline.h
+readline: ncurses $(STAGING_DIR)/usr/include/readline/readline.h $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY)
 
 readline-clean:
-	$(MAKE) -C $(READLINE_DIR) DESTDIR=$(STAGING_DIR) uninstall
+	-$(MAKE) -C $(READLINE_DIR) DESTDIR=$(STAGING_DIR) uninstall
+	-$(MAKE) -C $(READLINE_DIR) DESTDIR=$(TARGET_DIR) uninstall
 	-$(MAKE) -C $(READLINE_DIR) clean
 
 readline-dirclean:
 	rm -rf $(READLINE_DIR)
 
-readline-target: readline $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY)
-
-readline-target-clean:
-	-$(MAKE) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall
-
-ifeq ($(BR2_READLINE),y)
+ifeq ($(BR2_PACKAGE_READLINE),y)
 TARGETS+=readline
 endif
-ifeq ($(BR2_PACKAGE_READLINE_TARGET),y)
-TARGETS+=readline-target
-endif

package/ruby/Config.in

@@ -1,3 +1,6 @@
+comment "ruby has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_RUBY
+
 config BR2_PACKAGE_RUBY
 	bool "ruby"
 	help

package/smartmontools/Config.in

@@ -1,3 +1,6 @@
+comment "smartmontools has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_SMARTMONTOOLS
+
 config BR2_PACKAGE_SMARTMONTOOLS
 	bool "smartmontools"
 	help

package/strace/strace.mk

@@ -22,8 +22,8 @@ $(STRACE_HOOK_POST_INSTALL): $(STRACE_TARGET_INSTALL_TARGET)
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/strace
 	rm -f $(TARGET_DIR)/usr/bin/strace-graph
 ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
-	mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
+	mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
 	install -c $(TARGET_DIR)/usr/bin/strace \
-		$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/strace
+		$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/strace
 endif
 	touch $@

package/stunnel/Config.in

@@ -1,3 +1,6 @@
+comment "stunnel has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_STUNNEL
+
 config BR2_PACKAGE_STUNNEL
 	bool "stunnel"
 	help

package/stunnel/stunnel.mk

@@ -57,9 +57,9 @@ $(TARGET_DIR)/usr/bin/stunnel: $(STUNNEL_DIR)/src/stunnel
 	install -c $(STUNNEL_DIR)/src/stunnel $(TARGET_DIR)/usr/bin/stunnel
 	$(STRIPCMD) $(TARGET_DIR)/usr/bin/stunnel > /dev/null 2>&1
 ifeq ($(BR2_CROSS_TOOLCHAIN_TARGET_UTILS),y)
-	mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils
+	mkdir -p $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils
 	install -c $(TARGET_DIR)/usr/bin/stunnel \
-		$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/target_utils/stunnel
+		$(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/target_utils/stunnel
 endif
 
 stunnel: uclibc $(TARGET_DIR)/usr/bin/stunnel

package/vtun/Config.in

@@ -1,3 +1,6 @@
+comment "vtun has no inherent support for AVR32" 
+	depends on BR2_avr32 && BR2_PACKAGE_VTUN
+
 config BR2_PACKAGE_VTUN
 	bool "vtun - BEWARE: read package/vtun/README.txt before use"
 	select BR2_PACKAGE_LZO

package/webkit/Config.in

@@ -1,18 +1,17 @@
 config BR2_PACKAGE_WEBKIT
 	bool "webkit"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_ICU
 	select BR2_PACKAGE_CURL
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBXSLT
-	select BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_SQLITE
-	depends on !BR2_PACKAGE_XSERVER_none
 	help
 		WebKit is an open source, standards compliant web browser engine.
-		It runs on top of X-Windows
 
 		http://webkit.org/
 
-comment "webkit       - disabled (requires X-Windows)"
-	depends on BR2_PACKAGE_XSERVER_none
-
+comment "webkit requires a toolchain with C++ support and WCHAR enabled"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR

package/webkit/webkit.mk

@@ -12,7 +12,7 @@ WEBKIT_INSTALL_TARGET = YES
 WEBKIT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
 
 WEBKIT_AUTORECONF = YES
-WEBKIT_DEPENDENCIES = icu curl libxml2 libxslt xserver_xorg-server libgtk2 sqlite
+WEBKIT_DEPENDENCIES = icu curl libxml2 libxslt libgtk2 sqlite
 WEBKIT_MAKE_OPT = GLIB_GENMARSHAL=$(HOST_GLIB)/bin/glib-genmarshal GLIB_MKENUMS=$(HOST_GLIB)/bin/glib-mkenums
 
 $(eval $(call AUTOTARGETS,package,webkit))

package/x11r7/Config.in

@@ -18,6 +18,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/libxcb/Config.in
 		source package/x11r7/mesa3d/Config.in
 		source package/x11r7/pthread-stubs/Config.in
+		source package/x11r7/xcb-util/Config.in
 		source package/x11r7/xlib_libFS/Config.in
 		source package/x11r7/xlib_libICE/Config.in
 		source package/x11r7/xlib_libSM/Config.in
@@ -126,6 +127,7 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xapp_xlsclients/Config.in
 		source package/x11r7/xapp_xlsfonts/Config.in
 		source package/x11r7/xapp_xmag/Config.in
+		source package/x11r7/xapp_xman/Config.in
 		source package/x11r7/xapp_xmessage/Config.in
 		source package/x11r7/xapp_xmh/Config.in
 		source package/x11r7/xapp_xmodmap/Config.in

package/x11r7/xapp_xman/Config.in

@@ -1,5 +1,4 @@
 config BR2_PACKAGE_XAPP_XMAN
-        bool "xapp_xman"
-        help
+	bool "xman"
+	help
 	  Manual page display program for the X Window System
-

package/x11r7/xcb-util/Config.in

@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XCB_UTIL
+	bool "xcb-util"
+	help
+	  Libraries which sit on top of libxcb, the core X protocol library,
+	  and some of the extension libraries.
+
+	  http://xcb.freedesktop.org/