Merge branch 'build-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot

package/directfb/Config.in

@@ -10,6 +10,7 @@ if BR2_PACKAGE_DIRECTFB
 config BR2_PACKAGE_DIRECTFB_MULTI
 	bool "directfb multi application"
 	select BR2_PACKAGE_LINUX_FUSION
+	depends on !BR2_KERNEL_none
 	help
 	  Enable use of multiple concurrent DirectFB applications
 

package/games/gnuchess/gnuchess-5.07-getline-conflicts.patch

@@ -0,0 +1,48 @@
+This patch fixes a conflict between the C library getline() function
+and gnuchess getline() function.
+
+Patch borrowed from the gnuchess Debian package.
+
+Index: gnuchess-5.07/src/input.c
+===================================================================
+--- gnuchess-5.07.orig/src/input.c	2009-09-29 16:01:38.000000000 +0200
++++ gnuchess-5.07/src/input.c	2009-09-29 16:02:57.000000000 +0200
+@@ -127,7 +127,7 @@
+ 	      (RealGameCnt+1)/2 + 1 );
+     }
+     pthread_mutex_lock(&input_mutex);
+-    getline(prompt);
++    get_line(prompt);
+     input_status = INPUT_AVAILABLE;
+     pthread_cond_signal(&input_cond);
+     pthread_mutex_unlock(&input_mutex);
+@@ -173,13 +173,13 @@
+ {
+ #ifdef HAVE_LIBREADLINE
+   if (isatty(STDIN_FILENO)) {
+-    getline = getline_readline;
++    get_line = getline_readline;
+     using_history();
+   } else {
+-    getline = getline_standard;
++    get_line = getline_standard;
+   }
+ #else
+-  getline = getline_standard;
++  get_line = getline_standard;
+ #endif
+   /* Start input thread */
+   pthread_create(&input_thread, NULL, input_func, NULL);
+Index: gnuchess-5.07/src/common.h
+===================================================================
+--- gnuchess-5.07.orig/src/common.h	2009-09-29 16:06:17.000000000 +0200
++++ gnuchess-5.07/src/common.h	2009-09-29 16:06:40.000000000 +0200
+@@ -745,7 +745,7 @@
+  * Input routine, initialized to one of the specific
+  * input routines. The given argument is the prompt.
+  */
+-void (*getline) (char *);
++void (*get_line) (char *);
+ 
+ #define MAXSTR 128
+ extern char inputstr[MAXSTR];

package/gawk/gawk.mk

@@ -48,7 +48,7 @@ $(GAWK_DIR)/.configured: $(GAWK_DIR)/.unpacked
 	touch $@
 
 $(GAWK_DIR)/$(GAWK_BINARY): $(GAWK_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(GAWK_DIR)
+	$(MAKE) -C $(GAWK_DIR)
 
 $(TARGET_DIR)/$(GAWK_TARGET_BINARY): $(GAWK_DIR)/$(GAWK_BINARY)
 	rm -f $(TARGET_DIR)/usr/bin/awk
@@ -61,7 +61,7 @@ $(TARGET_DIR)/$(GAWK_TARGET_BINARY): $(GAWK_DIR)/$(GAWK_BINARY)
 gawk: $(TARGET_DIR)/$(GAWK_TARGET_BINARY)
 
 gawk-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GAWK_DIR) uninstall
+	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(GAWK_DIR) uninstall
 	-$(MAKE) -C $(GAWK_DIR) clean
 
 gawk-dirclean:

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 dbus-glib hwdata udev $(TARGET_DIR)/$(HAL_TARGET_BINARY)
+hal: host-pkg-config host-libxml-parser-perl dbus-glib hwdata udev $(TARGET_DIR)/$(HAL_TARGET_BINARY)
 
 hal-clean:
 	rm -f $(TARGET_DIR)/etc/dbus-1/system.d/hal.conf

package/libgcrypt/libgcrypt.mk

@@ -12,7 +12,8 @@ LIBGCRYPT_INSTALL_TARGET = YES
 LIBGCRYPT_CONF_ENV = \
 	ac_cv_sys_symbol_underscore=no
 LIBGCRYPT_CONF_OPT = \
-	--disable-optimization
+	--disable-optimization \
+	--with-gpg-error-prefix=$(STAGING_DIR)/usr
 
 LIBGCRYPT_DEPENDENCIES = libgpg-error
 

package/linux-fusion/Config.in

@@ -1,4 +1,5 @@
 config BR2_PACKAGE_LINUX_FUSION
+	depends on !BR2_KERNEL_none
 	bool "linux-fusion communication layer for DirectFB multi"
 	help
 	  DirectFB Communication Layer allowing multiple DirectFB

package/ltp-testsuite/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LTP-TESTSUITE
 	bool "ltp-testsuite"
+	depends on BROKEN
 	help
 	  The Linux Test Project provides a huge testsuite for Linux.
 

package/multimedia/vlc/Config.in

@@ -1,5 +1,8 @@
 config BR2_PACKAGE_VLC
 	bool "vlc"
+	# Improper ./configure options passed compared to the
+        # multimedia libraries available in Buildroot.
+	depends on BROKEN
 	help
 	  a free cross-platform media player
 

package/php/Config.in

@@ -7,21 +7,40 @@ config BR2_PACKAGE_PHP
 
 	  http://www.php.net
 
+if BR2_PACKAGE_PHP
+
 config BR2_PACKAGE_PHP_CLI
-        bool "cli interface"
-        depends on BR2_PACKAGE_PHP
-        default y
-        help
-          command line interface for php.
-          you must have at least cli or cgi selected.
+       bool
 
 config BR2_PACKAGE_PHP_CGI
-        bool "cgi interface"
-        depends on BR2_PACKAGE_PHP
-        default y
+       bool
+
+choice
+        prompt "PHP interface"
+        default BR2_PACKAGE_PHP_SAPI_CGI
         help
-          cgi interface for php
-          you must have at least cli or cgi selected.
+          Select the PHP interface(s).
+
+config BR2_PACKAGE_PHP_SAPI_CLI
+        bool "cli interface"
+	select BR2_PACKAGE_PHP_CLI
+        help
+          Command line interface for PHP.
+
+config BR2_PACKAGE_PHP_SAPI_CGI
+        bool "cgi interface"
+        select BR2_PACKAGE_PHP_CGI
+        help
+          CGI interface for PHP.
+
+config BR2_PACKAGE_PHP_SAPI_CLI_CGI
+        bool "cli and cgi interfaces"
+	select BR2_PACKAGE_PHP_CLI
+	select BR2_PACKAGE_PHP_CGI
+	help
+	  Command line and CGI interfaces for PHP.
+
+endchoice
 
 config BR2_PACKAGE_PHP_FASTCGI
         bool "fastcgi"
@@ -30,6 +49,5 @@ config BR2_PACKAGE_PHP_FASTCGI
         help
           fast cgi interface for php
 
-if BR2_PACKAGE_PHP
 source "package/php/Config.ext"
 endif

package/sed/sed.mk

@@ -3,7 +3,7 @@
 # sed
 #
 #############################################################
-SED_VERSION:=4.1.5
+SED_VERSION:=4.2.1
 SED_SOURCE:=sed-$(SED_VERSION).tar.gz
 SED_SITE:=$(BR2_GNU_MIRROR)/sed
 SED_CAT:=$(ZCAT)
@@ -100,7 +100,7 @@ endif
 #############################################################
 $(SED_DIR2)/.unpacked: $(DL_DIR)/$(SED_SOURCE)
 	$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(CONFIG_UPDATE) $(SED_DIR2)/config
+	$(CONFIG_UPDATE) $(SED_DIR2)/build-aux
 	touch $@
 
 $(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked

package/shared-mime-info/shared-mime-info.mk

@@ -16,7 +16,7 @@ SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-libglib2 host-libxml2 host-
 
 SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
 
-HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config
+HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-intltool
 
 HOST_SHARED_MIME_INFO_CONF_OPT = \
 	--disable-update-mimedb