aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2010-05-11 09:10:43 +0200
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2010-05-11 09:10:43 +0200
commit77e2dfffae077cb14bb4f70136a0c39b687d2150 (patch)
treed62a42f21748b05af37984662124fde1188c3c94 /package
parentc488481e9caf7717f50d89b952a27cbcc6343639 (diff)
parentba9a902bf862a60a91f2a9d3afbd1fe5470fcb53 (diff)
downloadbuildroot-77e2dfffae077cb14bb4f70136a0c39b687d2150.tar.gz
buildroot-77e2dfffae077cb14bb4f70136a0c39b687d2150.tar.bz2
Merge branch 'build-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package')
-rw-r--r--package/directfb/Config.in1
-rw-r--r--package/games/gnuchess/gnuchess-5.07-getline-conflicts.patch48
-rw-r--r--package/gawk/gawk.mk4
-rw-r--r--package/hal/hal.mk2
-rw-r--r--package/libgcrypt/libgcrypt.mk3
-rw-r--r--package/linux-fusion/Config.in1
-rw-r--r--package/ltp-testsuite/Config.in1
-rw-r--r--package/multimedia/vlc/Config.in3
-rw-r--r--package/php/Config.in38
-rw-r--r--package/sed/sed.mk4
-rw-r--r--package/shared-mime-info/shared-mime-info.mk2
11 files changed, 90 insertions, 17 deletions
diff --git a/package/directfb/Config.in b/package/directfb/Config.in
index 5e81b7ede8..8a0a736129 100644
--- a/package/directfb/Config.in
+++ b/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
diff --git a/package/games/gnuchess/gnuchess-5.07-getline-conflicts.patch b/package/games/gnuchess/gnuchess-5.07-getline-conflicts.patch
new file mode 100644
index 0000000000..94add7969e
--- /dev/null
+++ b/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];
diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 8886e6b3dc..4dd1085b73 100644
--- a/package/gawk/gawk.mk
+++ b/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:
diff --git a/package/hal/hal.mk b/package/hal/hal.mk
index 746107b7bb..262fc41bcc 100644
--- a/package/hal/hal.mk
+++ b/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
diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
index ef13de75f6..646ad83194 100644
--- a/package/libgcrypt/libgcrypt.mk
+++ b/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
diff --git a/package/linux-fusion/Config.in b/package/linux-fusion/Config.in
index 6fb5260768..ebd00b4575 100644
--- a/package/linux-fusion/Config.in
+++ b/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
diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index 46c82214f0..efe0db74f9 100644
--- a/package/ltp-testsuite/Config.in
+++ b/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.
diff --git a/package/multimedia/vlc/Config.in b/package/multimedia/vlc/Config.in
index c8faaa7c68..412a3c72cf 100644
--- a/package/multimedia/vlc/Config.in
+++ b/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
diff --git a/package/php/Config.in b/package/php/Config.in
index aef6e58c64..23d86e48e7 100644
--- a/package/php/Config.in
+++ b/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
+
+config BR2_PACKAGE_PHP_CGI
+ bool
+
+choice
+ prompt "PHP interface"
+ default BR2_PACKAGE_PHP_SAPI_CGI
+ help
+ Select the PHP interface(s).
+
+config BR2_PACKAGE_PHP_SAPI_CLI
bool "cli interface"
- depends on BR2_PACKAGE_PHP
- default y
+ select BR2_PACKAGE_PHP_CLI
help
- command line interface for php.
- you must have at least cli or cgi selected.
+ Command line interface for PHP.
-config BR2_PACKAGE_PHP_CGI
+config BR2_PACKAGE_PHP_SAPI_CGI
bool "cgi interface"
- depends on BR2_PACKAGE_PHP
- default y
+ select BR2_PACKAGE_PHP_CGI
help
- cgi interface for php
- you must have at least cli or cgi selected.
+ 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
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index 35cedce5b1..e5a5d005bb 100644
--- a/package/sed/sed.mk
+++ b/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
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
index fe1414257b..487d4b2322 100644
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/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