Commit 51a5b444 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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

parents 0f40a46a 1d7b6f65

package/avahi/avahi.mk

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \ 
		--with-autoipd-user=default \

		--with-autoipd-group=default



AVAHI_DEPENDENCIES = $(if $(BR2_PACKAGE_GETTEXT),gettext)

AVAHI_DEPENDENCIES = $(if $(BR2_PACKAGE_GETTEXT),gettext) host-intltool



ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)

AVAHI_DEPENDENCIES += libdaemon

package/busybox/busybox-1.16.0-fsync.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff -urpN busybox-1.16.0/coreutils/fsync.c busybox-1.16.0-fsync/coreutils/fsync.c

--- busybox-1.16.0/coreutils/fsync.c	2010-01-25 01:59:38.000000000 +0100

+++ busybox-1.16.0-fsync/coreutils/fsync.c	2010-02-26 08:24:59.000000000 +0100

@@ -7,6 +7,9 @@

  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.

  */

 #include "libbb.h"

+#ifndef O_NOATIME

+# define O_NOATIME 0

+#endif

 

 /* This is a NOFORK applet. Be very careful! */

package/libcgicc/cgicc-3.2.7-memset.patch

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
diff -urN cgicc-3.2.7-0rig//demo/dns.cpp cgicc-3.2.7/demo/dns.cpp

--- cgicc-3.2.7-0rig//demo/dns.cpp	2009-01-21 00:24:13.000000000 +0100

+++ cgicc-3.2.7/demo/dns.cpp	2009-01-21 00:24:30.000000000 +0100

@@ -34,6 +34,7 @@

 #include <vector>

 #include <stdexcept>

 #include <iostream>

+#include <string.h>

 

 #include "cgicc/CgiDefs.h"

 #include "cgicc/Cgicc.h"

package/libcgicc/cgicc-3.2.9-disable-documentation-option.patch

0 → 100644
+50 −0
Original line number Diff line number Diff line 
Index: cgicc-3.2.9/Makefile.am

===================================================================

--- cgicc-3.2.9.orig/Makefile.am	2010-02-25 16:34:06.000000000 +0100

+++ cgicc-3.2.9/Makefile.am	2010-02-25 16:34:14.000000000 +0100

@@ -8,9 +8,15 @@

 DEMO =

 endif

 

+if DOC

+DOCDIR = doc

+else

+DOC =

+endif

+

 ACLOCAL_AMFLAGS= 

 

-SUBDIRS = cgicc doc support $(DEMO)

+SUBDIRS = cgicc $(DOCDIR) support $(DEMO)

 

 CLEANFILES = *~

 

Index: cgicc-3.2.9/configure.ac

===================================================================

--- cgicc-3.2.9.orig/configure.ac	2010-02-25 16:34:06.000000000 +0100

+++ cgicc-3.2.9/configure.ac	2010-02-25 16:45:46.000000000 +0100

@@ -17,9 +17,23 @@

 AC_PROG_CXX

 AC_PROG_INSTALL

 AC_PROG_LIBTOOL

-AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, /bin/echo)

 

 

+AC_ARG_ENABLE(doc, 

+  [  --enable-doc          build doc [[default=yes]]],

+  [case "${enableval}" in

+    yes) cgicc_doc=yes ;;

+    no)  cgicc_doc=no ;;

+    *) AC_MSG_ERROR(bad value ${enableval} for --enable-doc) ;;

+  esac], cgicc_doc=yes)

+

+if test "$cgicc_doc" = yes; then

+ AC_CHECK_PROG(DOXYGEN, doxygen, doxygen)

+ if test -z "$DOXYGEN" ; then

+   AC_MSG_ERROR([Doxygen is required to build the documentation])

+ fi

+fi

+AM_CONDITIONAL(DOC, test "$cgicc_doc" = yes)

 

 dnl Determine host system type

package/libcgicc/libcgicc.mk

+5 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

#############################################################



LIBCGICC_VERSION=3.2.7

LIBCGICC_VERSION=3.2.9

LIBCGICC_DIR=$(BUILD_DIR)/cgicc-$(LIBCGICC_VERSION)

LIBCGICC_SITE=$(BR2_GNU_MIRROR)/cgicc

LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.gz
@@ -22,6 +22,7 @@ $(LIBCGICC_DIR)/.unpacked: $(DL_DIR)/$(LIBCGICC_SOURCE) 


$(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked

	(cd $(LIBCGICC_DIR); rm -f config.cache; \

		$(AUTORECONF); \

		$(TARGET_CONFIGURE_OPTS) \

		$(TARGET_CONFIGURE_ARGS) \

		./configure $(QUIET) \
@@ -33,15 +34,16 @@ $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked 
		--sysconfdir=/etc \

		--localstatedir=/var \

		--disable-demos \

		--disable-doc \

	)

	touch $@



$(LIBCGICC_DIR)/.compiled: $(LIBCGICC_DIR)/.configured

	$(MAKE) -C $(LIBCGICC_DIR)

	$(TARGET_MAKE_ENV) $(MAKE) -C $(LIBCGICC_DIR)

	touch $@



$(STAGING_DIR)/usr/lib/libcgicc.so: $(LIBCGICC_DIR)/.compiled

	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBCGICC_DIR) install

	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBCGICC_DIR) install

	touch -c $(STAGING_DIR)/usr/lib/libcgicc.so



$(TARGET_DIR)/usr/lib/libcgicc.so: $(STAGING_DIR)/usr/lib/libcgicc.so