From fcdc9f891d28af2c81fc3f74d4054895b8f228ae Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 May 2010 16:19:08 +0200 Subject: php: make sure either CLI or CGI is selected When neither CLI nor CGI is selected, PHP's configure script fails with: checking whether to build CGI binary... configure: error: No SAPIs selected. Of couse, the help text of the options says that at least one of them should be selected, but when doing testing with randpackageconfig, noone is reading these help texts. Therefore, based on the suggestion of Yann E. Morin, modify the Config.in organization so that at least one of the option is selected. Signed-off-by: Thomas Petazzoni --- package/php/Config.in | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/package/php/Config.in b/package/php/Config.in index aef6e58c6..23d86e48e 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 -- cgit v1.2.3 From 6bd1a449d61e2b7c989ec5a96037143b8f5024bb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 May 2010 16:21:30 +0200 Subject: gnuchess: add a patch to fix getline() conflict Signed-off-by: Thomas Petazzoni --- .../gnuchess/gnuchess-5.07-getline-conflicts.patch | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/games/gnuchess/gnuchess-5.07-getline-conflicts.patch 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 000000000..94add7969 --- /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]; -- cgit v1.2.3 From e627989ad847f6c7b295117334ce0abeb84dbdbb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 May 2010 16:21:52 +0200 Subject: gawk: remove CC override For some unknown reason, gawk.mk was overriding CC to $(TARGET_CC) at build time, while it had already been set at configure time to "$(TARGET_CC) $(TARGET_CFLAGS)" which is already the good value. Setting it to just $(TARGET_CC) breaks the compilation with external toolchains because we must pass the --sysroot option. But anyway, this was incorrect as we were loosing some CFLAGS set by Buildroot. Signed-off-by: Thomas Petazzoni --- package/gawk/gawk.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 8886e6b3d..4dd1085b7 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: -- cgit v1.2.3 From f5ff8cdc62182e3452d5811f1f0a25d3318b66af Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 May 2010 18:11:54 +0200 Subject: hal: add dependency on host-libxml-parser-perl hal integrates its own version of intltool tools, but they require libxml-parser-perl to be installed on the host. Signed-off-by: Thomas Petazzoni --- package/hal/hal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hal/hal.mk b/package/hal/hal.mk index 746107b7b..262fc41bc 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 -- cgit v1.2.3 From 8b47ede9e6d5301839d2d96dfd56e2117e0e8818 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 May 2010 18:13:06 +0200 Subject: libgcrypt: specify where gpg-error-config is libgcrypt depends on libgpg-error, but it needs to know where the gpg-error-config utility is. Signed-off-by: Thomas Petazzoni --- package/libgcrypt/libgcrypt.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index ef13de75f..646ad8319 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 -- cgit v1.2.3 From 6040190e920674913c0dd3dc4391a8590735f0fb Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 May 2010 18:13:52 +0200 Subject: linux-fusion: add dependency on !BR2_KERNEL_none linux-fusion is composed of a kernel module, and linux-fusion.mk uses several variable definitions that only exist when Buildroot compiles a kernel. We also add the same dependency to BR2_PACKAGE_DIRECTFB_MULTI, which relies on linux-fusion. Signed-off-by: Thomas Petazzoni --- package/directfb/Config.in | 1 + package/linux-fusion/Config.in | 1 + 2 files changed, 2 insertions(+) diff --git a/package/directfb/Config.in b/package/directfb/Config.in index 5e81b7ede..8a0a73612 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/linux-fusion/Config.in b/package/linux-fusion/Config.in index 6fb526076..ebd00b457 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 -- cgit v1.2.3 From aa3439e6a3fe26dbfe634d3ca9f1f5763a97a003 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 May 2010 20:55:44 +0200 Subject: vlc: mark as broken Before 2010.02, VLC didn't build, because it didn't pass the appropriate --disable- options according to the libraries available in Buildroot. Now, 2010.05 is going to be released, and no one bothered to fix VLC. Therefore, let's mark VLC as broken. Signed-off-by: Thomas Petazzoni --- package/multimedia/vlc/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/multimedia/vlc/Config.in b/package/multimedia/vlc/Config.in index c8faaa7c6..412a3c72c 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 -- cgit v1.2.3 From 844bbbb3fd10906d0c4e15ac57578f13b00fcf32 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 May 2010 22:52:10 +0200 Subject: sed: bump to 4.2.1 to fix build failure Version 4.1.5 fails to build due to the infamous getline() conflict issue. 4.2.1 doesn't have this problem. Signed-off-by: Thomas Petazzoni --- package/sed/sed.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 35cedce5b..e5a5d005b 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 -- cgit v1.2.3 From bb39f18905e371f760340791cc23fc1542348749 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 May 2010 23:16:28 +0200 Subject: ltp-testsuite: mark as broken The install step, done with fakeroot, tries to install things in /opt: make[2]: Entering directory `/home/test/buildroot/output.ctng-arm-eglibc-2010-05-07-19-39-56/target/root/ltp-full-20090630/lib' install -D -m 644 libltp.a //opt/ltp/lib/libltp.a install: cannot create directory //opt/ltp: Permission denied make[2]: *** [install] Error 1 Signed-off-by: Thomas Petazzoni --- package/ltp-testsuite/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in index 46c82214f..efe0db74f 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. -- cgit v1.2.3 From ba9a902bf862a60a91f2a9d3afbd1fe5470fcb53 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 May 2010 23:32:44 +0200 Subject: shared-mime-info: missing dependency on host-intltool Signed-off-by: Thomas Petazzoni --- package/shared-mime-info/shared-mime-info.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk index fe1414257..487d4b232 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 -- cgit v1.2.3