From 7ba5e386296f1b77ab25984773a690337461260a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 25 Feb 2010 14:56:39 +0100 Subject: avahi: add dependency on host-intltool Without intltool, configuration fails with: checking for intltool >= 0.35.0... ./configure: line 28714: intltool-update: command not found found Signed-off-by: Thomas Petazzoni --- package/avahi/avahi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 0c9d11e90..b3e1d9bd8 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -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 -- cgit v1.2.3 From 85e611804bc6de69f3aff1f896a0655223259ea6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 25 Feb 2010 15:24:07 +0100 Subject: libcgicc: fix build breakage and bump version First, the build was failing with: cd .. && /bin/sh /home/test/brbuild/build/cgicc-3.2.7/support/missing --run autoheader /home/test/brbuild/build/cgicc-3.2.7/support/missing: line 52: autoheader: command not found WARNING: `autoheader' is missing on your system. You should only need it if you modified `acconfig.h' or `configure.ac'. You might want to install the `Autoconf' and `GNU m4' packages. Grab them from any GNU archive site. That was because the PATH doesn't contain $(HOST_DIR)/usr/bin. So we pass $(TARGET_MAKE_ENV) when calling make. Then, the build was failing because of the crappy configure.ac and doc/Makefile.am this project has. configure.ac checks if doxygen is available, and if it isn't, it sets DOXYGEN to /bin/echo. Then, doc/Makefile.am does: DATE=`date '+%-d %b %Y'` VERSION=$(VERSION) $(DOXYGEN) Doxyfile cp $(IMAGES) cgicc-doc.css html mv html/index.html html/index.html.bak When DOXYGEN=/bin/echo, then the first line does not generate anything in html/, and the third line fails. Therefore, we add a patch that allows to pass a --disable-doc option, which removes the check for Doxygen. If --enable-doc is passed, then the configure script fails if Doxygen isn't found (but in the Buildroot case, we always pass --disable-doc to avoid the doxygen dependency). We also take this opportunity to bump the version of libcgicc, and to remove a patch that is no longer needed due to this version bump. Signed-off-by: Thomas Petazzoni --- package/libcgicc/cgicc-3.2.7-memset.patch | 12 ------ .../cgicc-3.2.9-disable-documentation-option.patch | 50 ++++++++++++++++++++++ package/libcgicc/libcgicc.mk | 8 ++-- 3 files changed, 55 insertions(+), 15 deletions(-) delete mode 100644 package/libcgicc/cgicc-3.2.7-memset.patch create mode 100644 package/libcgicc/cgicc-3.2.9-disable-documentation-option.patch diff --git a/package/libcgicc/cgicc-3.2.7-memset.patch b/package/libcgicc/cgicc-3.2.7-memset.patch deleted file mode 100644 index f1c1411e9..000000000 --- a/package/libcgicc/cgicc-3.2.7-memset.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 - #include - #include -+#include - - #include "cgicc/CgiDefs.h" - #include "cgicc/Cgicc.h" - diff --git a/package/libcgicc/cgicc-3.2.9-disable-documentation-option.patch b/package/libcgicc/cgicc-3.2.9-disable-documentation-option.patch new file mode 100644 index 000000000..a7b04a83a --- /dev/null +++ b/package/libcgicc/cgicc-3.2.9-disable-documentation-option.patch @@ -0,0 +1,50 @@ +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 + diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index 5237e70fd..b4cf56734 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -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 -- cgit v1.2.3 From c789fbddf491e91b5f3e3b408221117aa04095dc Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 26 Feb 2010 08:29:11 +0100 Subject: libraw1394: fix tarball URL The website of libraw1394 isn't anymore on http://www.linux1394.org. Signed-off-by: Thomas Petazzoni --- package/libraw1394/libraw1394.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk index 2dfaadc41..045cc82df 100644 --- a/package/libraw1394/libraw1394.mk +++ b/package/libraw1394/libraw1394.mk @@ -6,7 +6,7 @@ LIBRAW1394_VERSION:=1.2.1 LIBRAW1394_SOURCE:=libraw1394-$(LIBRAW1394_VERSION).tar.gz -LIBRAW1394_SITE:=http://www.linux1394.org/dl +LIBRAW1394_SITE:=http://www.kernel.org/pub/linux/libs/ieee1394/ LIBRAW1394_DIR:=$(BUILD_DIR)/libraw1394-$(LIBRAW1394_VERSION) $(DL_DIR)/$(LIBRAW1394_SOURCE): -- cgit v1.2.3 From c4ba3fdae5a576ed26815a3ef637614b2017fc18 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 26 Feb 2010 08:35:26 +0100 Subject: cramfs: add CFLAGS/LDFLAGS and host-zlib dependency cramfs depends on host-zlib, so it must be built prior to cramfs. Moreover, we need to pass the HOST_CFLAGS and HOST_LDFLAGS variables, otherwise it doesn't find zlib in $(HOST_DIR). Signed-off-by: Thomas Petazzoni --- target/cramfs/cramfs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk index 79353b5ca..e6d63ed01 100644 --- a/target/cramfs/cramfs.mk +++ b/target/cramfs/cramfs.mk @@ -20,10 +20,10 @@ $(CRAMFS_DIR): $(DL_DIR)/$(CRAMFS_SOURCE) toolchain/patch-kernel.sh $(CRAMFS_DIR) target/cramfs/ cramfs\*.patch $(CRAMFS_DIR)/mkcramfs: $(CRAMFS_DIR) - $(MAKE) CFLAGS="-Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" -C $(CRAMFS_DIR) + $(MAKE) CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS="$(HOST_LDFLAGS)" -C $(CRAMFS_DIR) touch -c $@ -cramfs: $(CRAMFS_DIR)/mkcramfs +cramfs: host-zlib $(CRAMFS_DIR)/mkcramfs cramfs-source: $(DL_DIR)/$(CRAMFS_SOURCE) -- cgit v1.2.3 From be8a104c3cd65190e32aebcbc8430fb23c42361f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 26 Feb 2010 08:36:38 +0100 Subject: squashfs: pass CFLAGS/LDFLAGS and add host-zlib dependency Squashfs depends on host-zlib, so we add this as a dependency. As host-zlib is installed in $(HOST_DIR), we must pass $(HOST_CFLAGS) and $(HOST_LDFLAGS). Unfortunately, if we pass CFLAGS=$(HOST_CFLAGS), we override the CFLAGS defined in the Makefile, and the build fails. Therefore, we borrow a patch from OpenEmbedded to fix this problem. Signed-off-by: Thomas Petazzoni --- .../squashfs/squashfs-4.0-build-system-fix.patch | 65 ++++++++++++++++++++++ target/squashfs/squashfsroot.mk | 4 +- 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 target/squashfs/squashfs-4.0-build-system-fix.patch diff --git a/target/squashfs/squashfs-4.0-build-system-fix.patch b/target/squashfs/squashfs-4.0-build-system-fix.patch new file mode 100644 index 000000000..7ba0ab94a --- /dev/null +++ b/target/squashfs/squashfs-4.0-build-system-fix.patch @@ -0,0 +1,65 @@ +Fix the build system so that CFLAGS can be overriden on the command +line to pass additionnal -I options. + +Patch borrowed from OpenEmbedded. + +Index: squashfs-4.0/squashfs-tools/Makefile +=================================================================== +--- squashfs-4.0.orig/squashfs-tools.orig/Makefile 2009-04-19 01:47:43.000000000 +0200 ++++ squashfs-4.0/squashfs-tools/Makefile 2009-04-19 01:52:36.000000000 +0200 +@@ -1,36 +1,48 @@ + INSTALL_DIR = /usr/local/bin + + INCLUDEDIR = . ++CFLAGS_R = -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE ++LIBS = -lz -lpthread + + CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 + + all: mksquashfs unsquashfs + + mksquashfs: mksquashfs.o read_fs.o sort.o swap.o pseudo.o +- $(CC) mksquashfs.o read_fs.o sort.o swap.o pseudo.o -lz -lpthread -lm -o $@ ++ $(CC) $(LDFLAGS) mksquashfs.o read_fs.o sort.o swap.o pseudo.o -lz -lpthread -lm -o $@ + + mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h squashfs_swap.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + + read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h squashfs_swap.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + + sort.o: sort.c squashfs_fs.h global.h sort.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + + swap.o: swap.c Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + + pseudo.o: pseudo.c pseudo.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + + unsquashfs: unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o +- $(CC) unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o -lz -lpthread -lm -o $@ ++ $(CC) $(LDFLAGS) unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o -lz -lpthread -lm -o $@ + +-unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h squashfs_compat.h global.h Makefile ++unsquashfs.o: unsquashfs.c unsquashfs.h squashfs_fs.h squashfs_swap.h squashfs_compat.h global.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + +-unsquash-1.o: unsquashfs.h unsquash-1.c squashfs_fs.h squashfs_compat.h global.h Makefile ++unsquash-1.o: unsquash-1.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + +-unsquash-2.o: unsquashfs.h unsquash-2.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile ++unsquash-2.o: unsquash-2.c unsquashfs.h unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + +-unsquash-3.o: unsquashfs.h unsquash-3.c squashfs_fs.h squashfs_compat.h global.h Makefile ++unsquash-3.o: unsquash-3.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + +-unsquash-4.o: unsquashfs.h unsquash-4.c squashfs_fs.h squashfs_swap.h global.h Makefile ++unsquash-4.o: unsquash-4.c unsquashfs.h squashfs_fs.h squashfs_swap.h global.h Makefile ++ $(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $< + + clean: + -rm -f *.o mksquashfs unsquashfs diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk index ebb0cd2bd..63adc5c36 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -18,9 +18,9 @@ $(SQUASHFS_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFS_SOURCE) #$(SQUASHFS_PATCH) touch $@ $(SQUASHFS_DIR)/squashfs-tools/mksquashfs: $(SQUASHFS_DIR)/.unpacked - $(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools + $(MAKE) CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" -C $(SQUASHFS_DIR)/squashfs-tools -squashfs: $(SQUASHFS_DIR)/squashfs-tools/mksquashfs +squashfs: host-zlib $(SQUASHFS_DIR)/squashfs-tools/mksquashfs squashfs-source: $(DL_DIR)/$(SQUASHFS_SOURCE) -- cgit v1.2.3 From 1d7b6f65c633865b25c8603975f9aec88e4e1275 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 26 Feb 2010 08:59:16 +0100 Subject: busybox: add upstream 1.16 fix Fixes https://bugs.busybox.net/show_bug.cgi?id=1177, available at http://busybox.net/downloads/fixes-1.16.0/busybox-1.16.0-fsync.patch. Signed-off-by: Thomas Petazzoni --- package/busybox/busybox-1.16.0-fsync.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 package/busybox/busybox-1.16.0-fsync.patch diff --git a/package/busybox/busybox-1.16.0-fsync.patch b/package/busybox/busybox-1.16.0-fsync.patch new file mode 100644 index 000000000..b0d73ee6e --- /dev/null +++ b/package/busybox/busybox-1.16.0-fsync.patch @@ -0,0 +1,13 @@ +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! */ + -- cgit v1.2.3