Pull request for branch build-fixes
Hello,
Here is a set of random fixes for various build failures encountered while using randpackageconfig in my controlled/limited chroot test environment.
Thomas
The following changes since commit af850ce10fc490036247a8c0dd92c79f18b2281a:
Peter Korsgaard (1):
Merge branch 'squashfs-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot build-fixes
Thomas Petazzoni (9):
php: make sure either CLI or CGI is selected
gnuchess: add a patch to fix getline() conflict
gawk: remove CC override
hal: add dependency on host-libxml-parser-perl
libgcrypt: specify where gpg-error-config is
linux-fusion: add dependency on !BR2_KERNEL_none
vlc: mark as broken
sed: bump to 4.2.1 to fix build failure
ltp-testsuite: mark as broken
.../gnuchess/gnuchess-5.07-getline-conflicts.patch | 48 ++++++++++++++++++++ package/gawk/gawk.mk | 4 +- package/hal/hal.mk | 2 +- package/libgcrypt/libgcrypt.mk | 3 +- package/linux-fusion/Config.in | 1 + package/ltp-testsuite/Config.in | 1 + package/multimedia/vlc/Config.in | 1 + package/php/Config.in | 38 +++++++++++---- package/sed/sed.mk | 4 +- package/shared-mime-info/shared-mime-info.mk | 2 +- 10 files changed, 87 insertions(+), 17 deletions(-) create mode 100644 package/games/gnuchess/gnuchess-5.07-getline-conflicts.patch
Thanks,
Signature · 1 line
Thomas Petazzoni
PATCH 1/9 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.
--- package/php/Config.in | 38 ++++++++++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 10 deletions(-)
package/php/Config.in +28 -10
@@ -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
Signature · 1 line
1.6.3.3
PATCH 2/9 gnuchess: add a patch to fix getline() conflict
In reply to Thomas Petazzoni--- .../gnuchess/gnuchess-5.07-getline-conflicts.patch | 48 ++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) create mode 100644 package/games/gnuchess/gnuchess-5.07-getline-conflicts.patch
package/games/gnuchess/gnuchess-5.07-getline-conflicts.patch new file +48 -0
@@ -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];
Signature · 1 line
1.6.3.3
PATCH 3/9 gawk: remove CC override
In reply to Thomas PetazzoniFor 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.
--- package/gawk/gawk.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
package/gawk/gawk.mk +2 -2
@@ -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:
Signature · 1 line
1.6.3.3
PATCH 4/9 hal: add dependency on host-libxml-parser-perl
In reply to Thomas Petazzonihal integrates its own version of intltool tools, but they require libxml-parser-perl to be installed on the host.
--- package/hal/hal.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/hal/hal.mk +1 -1
@@ -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
Signature · 1 line
1.6.3.3
PATCH 5/9 libgcrypt: specify where gpg-error-config is
In reply to Thomas Petazzonilibgcrypt depends on libgpg-error, but it needs to know where the gpg-error-config utility is.
--- package/libgcrypt/libgcrypt.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
package/libgcrypt/libgcrypt.mk +2 -1
@@ -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
Signature · 1 line
1.6.3.3
PATCH 6/9 linux-fusion: add dependency on !BR2_KERNEL_none
In reply to Thomas Petazzonilinux-fusion is composed of a kernel module, and linux-fusion.mk uses several variable definitions that only exist when Buildroot compiles a kernel.
--- package/linux-fusion/Config.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/linux-fusion/Config.in +1 -0
@@ -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
Signature · 1 line
1.6.3.3
PATCH 6/9 linux-fusion: add dependency on !BR2_KERNEL_none
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> linux-fusion is composed of a kernel module, and linux-fusion.mk uses Thomas> several variable definitions that only exist when Buildroot compiles a Thomas> kernel.
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---
Thomas> package/linux-fusion/Config.in | 1 +
Thomas> 1 files changed, 1 insertions(+), 0 deletions(-)
Thomas> diff --git a/package/linux-fusion/Config.in b/package/linux-fusion/Config.in Thomas> index 6fb5260..ebd00b4 100644
Thomas> --- a/package/linux-fusion/Config.in
Thomas> +++ b/package/linux-fusion/Config.in
Thomas> @@ -1,4 +1,5 @@
Thomas> config BR2_PACKAGE_LINUX_FUSION
Thomas> + depends on !BR2_KERNEL_none
You should also make BR2_PACKAGE_DIRECTFB_MULTI depend on BR2_KERNEL_none then.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 7/9 vlc: mark as broken
In reply to Thomas PetazzoniBefore 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.
--- package/multimedia/vlc/Config.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/multimedia/vlc/Config.in +1 -0
@@ -1,5 +1,6 @@ config BR2_PACKAGE_VLC bool "vlc" + depends on BROKEN help a free cross-platform media player
Signature · 1 line
1.6.3.3
PATCH 7/9 vlc: mark as broken
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Before 2010.02, VLC didn't build, because it didn't pass the Thomas> appropriate --disable- options according to the libraries available in Thomas> Buildroot. Now, 2010.05 is going to be released, and no one bothered Thomas> to fix VLC. Therefore, let's mark VLC as broken.
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]> Thomas> ---
Thomas> package/multimedia/vlc/Config.in | 1 +
Thomas> 1 files changed, 1 insertions(+), 0 deletions(-)
Thomas> diff --git a/package/multimedia/vlc/Config.in b/package/multimedia/vlc/Config.in Thomas> index c8faaa7..a261607 100644
Thomas> --- a/package/multimedia/vlc/Config.in
Thomas> +++ b/package/multimedia/vlc/Config.in
Thomas> @@ -1,5 +1,6 @@
Thomas> config BR2_PACKAGE_VLC
Thomas> bool "vlc"
Thomas> + depends on BROKEN
It's nice to add a little comment about why it's broken, like we've done for some of the other packages.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 8/9 sed: bump to 4.2.1 to fix build failure
In reply to Thomas PetazzoniVersion 4.1.5 fails to build due to the infamous getline() conflict issue. 4.2.1 doesn't have this problem.
--- package/sed/sed.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
package/sed/sed.mk +2 -2
@@ -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
Signature · 1 line
1.6.3.3
PATCH 9/9 ltp-testsuite: mark as broken
In reply to Thomas PetazzoniThe 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
--- package/ltp-testsuite/Config.in | 1 + package/shared-mime-info/shared-mime-info.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
package/ltp-testsuite/Config.in +1 -0
@@ -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/shared-mime-info/shared-mime-info.mk +1 -1
@@ -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
Signature · 1 line
1.6.3.3
PATCH 9/9 ltp-testsuite: mark as broken
Quoted 2 lines · On Sun, 9 May 2010 23:26:43 +0200 Thomas Petazzoni…
package/ltp-testsuite/Config.in | 1 + package/shared-mime-info/shared-mime-info.mk | 2 +-
This was a mistake. I've split these in two separate patches at
http://git.buildroot.net/~tpetazzoni/git/buildroot/log/?h=build-fixes.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
Quoted 3 lines · On Sun, 9 May 2010 23:26:34 +0200 Thomas Petazzoni…
Here is a set of random fixes for various build failures encountered while using randpackageconfig in my controlled/limited chroot test environment.
I've updated this branch at :
git://git.busybox.net/~tpetazzoni/git/buildroot build-fixes
with two changes :
* Add a reason for which VLC is marked broken
* Add a dependency on !BR2_KERNEL_none for BR2_PACKAGE_DIRECTFB_MULTI
If you want me to resend a full pull request, don't hesitate to ask.
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> I've updated this branch at :
Thomas> git://git.busybox.net/~tpetazzoni/git/buildroot build-fixes
Thomas> with two changes :
Thomas> * Add a reason for which VLC is marked broken
Thomas> * Add a dependency on !BR2_KERNEL_none for BR2_PACKAGE_DIRECTFB_MULTI
Thomas> If you want me to resend a full pull request, don't hesitate to ask.
No, this is fine - Pulled, thanks!
Signature · 1 line
Bye, Peter Korsgaard