Commit 77e2dfff authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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

parents c488481e ba9a902b

package/directfb/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -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 → 100644
+48 −0
Original line number Diff line number Diff line 
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

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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