Commit Graph

7497 Commits

Author SHA1 Message Date
Peter Korsgaard
77e2dfffae Merge branch 'build-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot 2010-05-11 09:10:43 +02:00
Thomas Petazzoni
c488481e9c libnl: include limits.h to fix build failure
Fixes the ULONG_MAX definition problem:

In file included from cache.c:43:
../include/netlink-local.h: In function '__str2type':../include/netlink-local.h:218: error: 'ULONG_MAX' undeclared (first use in this function)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-11 09:02:07 +02:00
Thomas Petazzoni
c554cc2a2e netplug: disable -Werror to fix build failure
netplug uses nested functions, and gcc generates a warning that
is turned into an error:

cc1: warnings being treated as errors
if_info.c: In function 'ifsm_scriptdone':
if_info.c:289: error: generating trampoline in object (requires executable stack)

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-11 08:59:02 +02:00
Thomas Petazzoni
5b9384337a less: depends on curses
The less package already selects BR2_PACKAGE_CURSES, but it fails to
depend on it in the makefile. Therefore, there are cases where less
gets built before curses, and the build fails:

checking for working terminal libraries... Cannot find terminal libraries - configure failed

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-11 08:57:49 +02:00
Thomas Petazzoni
de73cdf478 hostapd: use internal crypto library
When OpenSSL is not enabled, hostapd relies on an internal
library. However, this library must be enabled, otherwise the
compilation of hostapd fails with:

/home/test/ctng-arm-eglibc/bin/../lib/gcc/arm-unknown-linux-gnueabi/4.3.4/../../../../arm-unknown-linux-gnueabi/bin/ld: cannot find -ltommath

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-11 08:57:09 +02:00
Paul Jones
18f72f9730 xvkbd: bump version
And fix dependencies while we're at it.

Signed-off-by: Paul Jones <paul@pauljones.id.au>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-11 08:53:32 +02:00
Thomas Petazzoni
ba9a902bf8 shared-mime-info: missing dependency on host-intltool
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-10 23:43:05 +02:00
Thomas Petazzoni
bb39f18905 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 <thomas.petazzoni@free-electrons.com>
2010-05-10 23:43:04 +02:00
Thomas Petazzoni
844bbbb3fd 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 <thomas.petazzoni@free-electrons.com>
2010-05-10 23:43:04 +02:00
Thomas Petazzoni
aa3439e6a3 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 <thomas.petazzoni@free-electrons.com>
2010-05-10 23:43:02 +02:00
Thomas Petazzoni
6040190e92 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 <thomas.petazzoni@free-electrons.com>
2010-05-10 23:41:51 +02:00
Peter Korsgaard
45ca86d4e9 libxcb: relax host-python regexp
Some python versions print x.y rather than x.y.z as version number, so
make regexp more robust.

Reported-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-10 22:18:44 +02:00
Peter Korsgaard
13de2613a3 package/games/vice: remove
Has been marked broken since Nov 2009, so removing as announced.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-10 22:07:37 +02:00
Thomas Petazzoni
8b47ede9e6 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 <thomas.petazzoni@free-electrons.com>
2010-05-09 23:25:07 +02:00
Thomas Petazzoni
f5ff8cdc62 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 <thomas.petazzoni@free-electrons.com>
2010-05-09 23:25:07 +02:00
Thomas Petazzoni
e627989ad8 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 <thomas.petazzoni@free-electrons.com>
2010-05-09 23:25:07 +02:00
Thomas Petazzoni
6bd1a449d6 gnuchess: add a patch to fix getline() conflict
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-09 23:25:07 +02:00
Thomas Petazzoni
fcdc9f891d 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 <thomas.petazzoni@free-electrons.com>
2010-05-09 23:25:06 +02:00
Peter Korsgaard
af850ce10f Merge branch 'squashfs-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot 2010-05-08 16:11:20 +02:00
Peter Korsgaard
395a70f72f CHANGES: #1531 and #1669 are now resolved
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-08 09:39:25 +02:00
Peter Korsgaard
5312113255 CHANGES: update with changes from misc-fixes2
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-08 00:11:46 +02:00
Peter Korsgaard
0d6068ae01 Merge branch 'misc-fixes2' of git://git.busybox.net/~tpetazzoni/git/buildroot 2010-05-08 00:09:11 +02:00
Peter Korsgaard
84278848f4 CHANGES: update with changes from misc-fixes
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-08 00:04:45 +02:00
Peter Korsgaard
2f81dd315f Merge branch 'misc-fixes' of git://git.busybox.net/~tpetazzoni/git/buildroot 2010-05-08 00:03:49 +02:00
Gustavo Zacarias
6f4939d4c5 hostapd: Fix build with external toolchain
Closes #1717

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-08 00:02:24 +02:00
Thomas Petazzoni
f6c18b97ca squashfs3: fix build when zlib isn't available on the host
We need to pass CFLAGS and LDFLAGS, and to rename the patch so that it
actually gets applied.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-07 21:32:02 +02:00
Thomas Petazzoni
d5a1757565 squashfs: fix build when zlib isn't available on the host
Pass CFLAGS and LDFLAGS so that when building squashfs, it finds the
zlib installed in $(HOST_DIR).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-07 21:32:02 +02:00
Thomas Petazzoni
e3963e90cc xlib_libX11: re-add a patch to fix the keysymdef issue
When xlib_libX11 was bumped to 1.3.2 in commit
1d956c9190, the keysymdef patch was
dropped. However, this patch is still needed in order to be able to
tell ./configure where the keysymdef header file is installed.

The patch has been updated for 1.3.2.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-07 21:28:59 +02:00
Thomas Petazzoni
4880edd506 libxcb: fix path to Python modules
When building libxcb, the variable XCBPROTO_XCBPYTHONDIR must point to
the location where the Python modules needed to run the c_client.py
program are installed. The path
$(STAGING_DIR)/usr/lib/python2.6/site-packages was hardcoded. However,
it doesn't work when the version of Python installed on the host is
Python 2.5.

Therefore, add a little bit of magic to compute the host Python
version.

We also verify that Python is available on the host, as we don't build
it in Buildroot.

Fixes bug #1531.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-07 21:28:33 +02:00
Thomas Petazzoni
b65e735291 busybox: disable MTD utils in default configuration
The MTD utils require MTD headers in the toolchain, and in several
external toolchains, they are not present. In order to make the build
work by default, let's disable the MTD Busybox applets in our default
configuration.

Fixes bug #1669

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-07 21:27:24 +02:00
Luca Ceresoli
ea0695ff5e customize: fix copy paths
Closes #849, #1135

customize.mk used to copy files with a wrong command, resulting in one
directory level in excess. For example, source/etc/myfile would have
produced /etc/etc/myfile in the target filesystem instead of /etc/myfile.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-06 23:27:58 +02:00
Gustavo Zacarias
34d7dc874a wpa_supplicant: Fix build with external toolchain
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-06 23:12:30 +02:00
Thomas Petazzoni
5e1fbd2c33 Fix the computation of REAL_GNU_TARGET_NAME
When the selected C library is glibc, the C library shouldn't be
mentionned in REAL_GNU_TARGET_NAME. In other words:

 arm-unknown-linux-uclibcgnueabi must be used for uClibc
 arm-unknown-linux-gnueabi must be used for glibc

This fixes the build of GDB on the target, as reported by Quotient
Remainder <quotientvremainder@gmail.com>.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-06 23:08:37 +02:00
Gustavo Zacarias
a5fe7371b2 pciutils: Fix cross compiling
Closes #1705

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-06 23:07:21 +02:00
Gustavo Zacarias
dfb503937d usbutils: fix recursive LIBUSB Kconfig issue and bump to 0.87
Closes #1699

[Peter: Use BR2_KERNEL_MIRROR]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-06 23:03:18 +02:00
Peter Korsgaard
137a6ccf5a package/sed: make HOST_SED_BINARY a simply expanded variable (:=)
HOST_SED_BINARY is used 2 times during startup, and is relatively
expensive to run, so make it a simple expanded variable (:=) rather
than a recursively expanded one (=).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-06 21:17:01 +02:00
Peter Korsgaard
6947eabea1 boa: use BOA_VERSION instead of spawning a shell/basename for build dir
And as it is a recursive variable, this is done twice during startup.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-06 21:10:42 +02:00
Peter Korsgaard
29df95079d check-host-sed.sh: add missing shebang line
Bash seems to be smart enough to source the file when execve returns
ENOEXEC, but other shells might not be.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-06 21:08:04 +02:00
Peter Korsgaard
c71816a8a5 Makefile: make GNU_HOST_NAME a simply expanded variable (:=)
GNU_HOST_NAME is referred more than 100 times in the tree, used 5
times during startup, and is relatively expensive to run - so make
it a simple expanded variable (:=) rather than recursively expanded
one (=).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-06 20:56:25 +02:00
Peter Korsgaard
4efdd9f3d9 Makefile.package.in: optimize UPPERCASE macro
As noticed by Thomas, we call the UPPERCASE macro a lot, and it slows down
startup quite a bit.

Optimize it by implementing it in make, rather than forking a shell + tr.
The implementation is heavily based on the 'up' macro from gmsl
(http://gmsl.sf.net)

With this in place, startup time is ~5 times lower.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-06 20:56:18 +02:00
Thomas Petazzoni
803967499f xfonts: fix dependencies and build process
Instead of assuming that mkfontdir and mkfontscale are available on
the development system, use the one installed in $(HOST_DIR).

The FCCACHE variable is removed, because, for some reason, the
installation process of xfonts disables the call to fc-cache when a
DESTDIR is passed. See the definition of XORG_FONT_FCCACHE in
aclocal.m4 in font packages:

AC_DEFUN([XORG_FONT_FCCACHE],[
        AC_PATH_PROG(FCCACHE, fc-cache)
        FCCACHE_WARN='echo "** Warning: fonts.cache not built" ; echo "** Generate this file manually on host system using fc-cache"'
        if test x"$FCCACHE" = x ; then
                RUN_FCCACHE="${FCCACHE_WARN}"
        else
                RUN_FCCACHE='@(if test -z "$(DESTDIR)"; then echo $(FCCACHE) $(fontdir); $(FCCACHE) $(fontdir); else'
                RUN_FCCACHE="${RUN_FCCACHE} ${FCCACHE_WARN} ; fi)"
        fi
        AC_SUBST([RUN_FCCACHE])
])

In addition to this, we update the font dependencies to include
font-utils for the host, mkfontdir for the host, mkfontscale for the
host and bdftopcf for the host.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-06 20:18:42 +02:00
Thomas Petazzoni
3be79ce2a5 xapp_mkfontdir: enable for the host
When compiling xfonts, mkfontdir is needed for the host, therefore,
enable it.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-06 20:18:42 +02:00
Thomas Petazzoni
a10439d3cd Enable xapp_bdftopcf dependencies for the host
Now that xapp_bdftopcf is enabled on the host, we also need its
dependencies to be available for the host. The dependency of
host-xapp_bdftopcf is host-xlib_libXfont, which itself depends on a
bunch of other packages. Some of them were already available for the
host, some not (xfont_encodings, xlib_xtrans, xproto_fontcacheproto,
xproto_fontsproto) and are therefore added by this patch.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-06 20:18:42 +02:00
Thomas Petazzoni
34fec71532 xapp_bdftopcf: enable for the host
Compiling xfonts require having bdftopcf installed on the
host. Therefore, enable host support for this package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-06 20:18:41 +02:00
Thomas Petazzoni
4a57f7d261 xfont_font-util: enable host package
When compiling xfonts, host utilities like bdftopcf or ucs2any, part
of xfont_font-util are needed. Until now, xfont_font-util was
installing ugly symbolic links, assuming that these tools were
available on the development machine.

This patch enables the host package for xfont_font-util, removes the
post-install.sh script, and keeps only the useful part of this script
in a post install hook.

host-xfont_font-util will be used later by xfont packages.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-06 20:18:41 +02:00
Thomas Petazzoni
2eb4b09529 Add staging libraries directories to -L in external case
In order to solve issues of libtool trying to link target components
against host libraries, it seems that specifying -L$(STAGING_DIR)/lib
and -L$(STAGING_DIR)/usr/lib works.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-06 20:18:41 +02:00
Thomas Petazzoni
6b939d40f6 Add -rpath option for host package compilation
In c1b6242fdc, we added
$(HOST_DIR)/usr/lib to LD_LIBRARY_PATH when building target packages,
because the build of target packages sometimes require host tools
installed in $(HOST_DIR)/usr/bin which themselves require host
libaries installed in $(HOST_DIR)/usr/lib.

Unfortunately, this solution didn't work, as libtool then tried to
link target binaries against host libraries. So $(HOST_DIR)/usr/lib
got removed from LD_LIBRARY_PATH in
0d1830b07d.

However, this meant that we went back to the previous situation, in
which host tools used during compilation of target components might
require host libraries. An example :

make[2]: Entering directory `/home/test/buildroot/output.ctng-arm-eglibc-2010-05-04-12-41-00/build/xfont_font-adobe-100dpi-1.0.1'
/home/test/buildroot/output.ctng-arm-eglibc-2010-05-04-12-41-00/host/usr/bin/mkfontdir /home/test/buildroot/output.ctng-arm-eglibc-2010-05-04-12-41-00/target/usr/share/fonts/X11/100dpi
/home/test/buildroot/output.ctng-arm-eglibc-2010-05-04-12-41-00/host/usr/bin/mkfontscale: error while loading shared libraries: libfontenc.so.1: cannot open shared object file: No such file or directory

Therefore, we try another solution: make sure that host binaries are
linked with an -rpath option, so that $(HOST_DIR)/usr/lib doesn't need
to be in LD_LIBRARY_PATH for them to find their libraries.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-05-06 20:17:38 +02:00
Paulius Zaleckas
d701a82321 Remove gtk-doc documentations from target
On my target rootfs it is installed documentation for:
atk, cairo, gdk, gdk-pixbuf, gio, glib, gobject, gtk, pango

It ocupies 34M of space. Configure option --disable-gtk-doc doesn't
prevent installation of it. So we should remove them manually if
documentation is disabled.

[Peter: also remove manual rm's from hal/libxml2/libglade]
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-05 12:21:21 +02:00
Peter Korsgaard
79db1ff5ac hal: cleanup package
Closes #1525

Kconfig selects are not recursive, so ensure we select the dependencies
of our dependencies as well.

Cleanup target installation:
- Remove tasks handled by the generic post-build cleanup
- Hal doesn't install etc/rc.d, so don't try to delete it

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-04 23:11:20 +02:00
Peter Korsgaard
32ed970075 mplayer: disable parallel builds (make -jX)
The build system races with itself when building the internal vidix stuff
(x86 only), so use MAKE1.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-04 22:48:16 +02:00