Commit Graph

408 Commits

Author SHA1 Message Date
Vasily Khoruzhick
017e3061fd xlib_libXfont: don't build devel documentation for host
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-16 22:23:51 +02:00
Vasily Khoruzhick
5276dec0e0 font-misc-misc: Don't pull fonts encodings from host system
Use encodings from staging dir.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-16 22:23:41 +02:00
Vasily Khoruzhick
12cdabeeb5 xlib_libX11: don't build docs for host
It depends on utils provided by host system, and
they sometimes are missing.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-16 22:20:07 +02:00
Peter Korsgaard
1990a9cb92 xlib_xtrans: drop pkgconfig patch now we're search usr/share/pkgconfig
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-27 21:48:30 +02:00
Gustavo Zacarias
723f276ffd xorg-server: point localstatedir to /var
We don't want logs to end up in /usr/var/log

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-10 14:38:58 +01:00
Peter Korsgaard
68f166074b package/x11r7: apply libtool patch where possible
Now that we have libtool-2.2.x patch support, we can get rid of a bunch
of _LIBTOOL_PATH = NO, fixing (potential) cross link issues.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-17 13:56:10 +01:00
Peter Korsgaard
a52509a4dd xfont_font-util: remove mapfiles workaround
Not needed (in fact breaks the build) now pkg-config --variable= does the
right thing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-01-30 21:08:10 +01:00
Peter Korsgaard
3e1fd70150 libxcb: use correct python variable
Directory is /usr/lib/python$(PYTHON_VERSION_MAJOR).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-01-28 09:16:09 +01:00
Peter Korsgaard
5f19df9224 libxcb: use host-python and fix dependencies
Now that we have a proper host-python package, use that one instead of
whatever might be available on the build host. Also don't overwrite
the host-python package version variable and fix dependency list
(xcb-proto is needed for the host).

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-01-27 23:38:48 +01:00
Peter Korsgaard
f13d97e106 xcb-proto: needs python for the host
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-01-27 23:34:39 +01:00
Peter Korsgaard
213f15be3d xapp_xlogo: needs libXft and pkg-config
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-29 15:54:58 +01:00
Peter Korsgaard
d741cf7c62 mesa3d: ensure it can only be compiled with modular X server
kdrive has no glx support, and mesa3d depends on libdrm which needs
largefile support (just like the modular server), so ensure mesa3d
can only be enabled in that configuration.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-27 21:12:25 +01:00
Thomas Petazzoni
6ddf470264 xkeyboard-config: bump to 2.0 to fix bug 2965
Closes #2965

For some odd reason, xkeyboard-config < 1.8 was creating a symbolic
link from /usr/share/X11/xkb/xkbcomp to the xkbcomp binary. But in
cross-compilation mode, this is absurd as the xkbcomp binary to which
the link is pointing is the one in $(HOST_DIR).

This symbolic link thing has been removed completely starting from
xkeyboard-config 1.9. See
http://cgit.freedesktop.org/xkeyboard-config/commit/?id=f413dff57e77e7b01461508f74b4e92d1dc8defd.

Therefore, we simply bump xkeyboard-config to the latest available
version, 2.0.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-22 21:44:19 +01:00
Thomas Petazzoni
eb56385b24 xlib_libX11: compile makekeys for the host correctly
As reported by Miroslav Ignjatovic in bug #2983, our hack in
xlib_libX11 to build makekeys for the host does not work, for several
reasons:

 * As we are building a tool for the host, we shouldn't pass
   -I$(STAGING_DIR)/usr/include, since the $(STAGING_DIR) contains
   headers of packages for the target.

 * Instead, we should use the headers in $(HOST_DIR)/usr/include. They
   were not used due to a typo: $(HOST_CFLAGS) must be used instead of
   $(HOSTCFLAGS).

 * Finally, in order for makekeys to find the required headers in
   $(HOST_DIR)/usr/include, we must depend on host-xproto_xproto.

This fixes bug #2983.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-21 14:20:17 +01:00
Matt Johnson
936be892dd xserver-xorg: fix CFLAGS
Ensure we just append to TARGET_CFLAGS, instead of overriding it.

Signed-off-by: Matt Johnson <mj1856@hotmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-27 22:23:49 +01:00
Peter Korsgaard
69a8991bdc xserver-xorg: enable glx support if mesa3d is enabled
Closes #2533

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-07 21:02:38 +01:00
Paulius Zaleckas
d906f6de9f xapp_xinit: Bump to 1.2.1
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-05 10:27:37 +01:00
Paulius Zaleckas
1bc5b0bdf1 Create X symlink for TinyX
When installing TinyX to target create /usr/bin/X symlink
to Xfbdev as it is the only TinyX driver we build.
This makes utils like startx happy :)

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-05 10:26:29 +01:00
Thomas Petazzoni
5f71fc1f19 Remove support for shared configuration cache
The configuration cache shared between packages, while being in
principle a nice idea to speed-up the configuration of packages by
avoiding repetitive identical checks, turned out to be unreliable due
to the subtle differences between similar but not identical checks in
different packages. After spending some time trying to fix those, we
concluded that supporting the shared configuration cache is definitely
too hard and too unreliable, and that we'd better get rid of it
altogether.

This patch therefore removes the shared configuration cache
infrastructure and usage.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-05 10:21:17 +01:00
Peter Korsgaard
aecb5b4dc7 xapp_xmore: needs libXaw
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-10-14 20:59:07 +02:00
Peter Korsgaard
0eacc81fa2 xapp_xmore: remove double libXprintUtil dependency
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-10-14 20:57:49 +02:00
Peter Korsgaard
05d5ce590b xapp_xcursorgen: bump version
Needed for libpng 1.4.x support.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-10-14 20:49:28 +02:00
Peter Korsgaard
ab6925eabf xapp_xinput: needs libXi
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-10-14 20:46:49 +02:00
Peter Korsgaard
73a1f4ba5f xapp_xbacklight: needs libXrandr/Xrender
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-10-06 10:18:48 +02:00
Peter Korsgaard
a82675239c xapp_twm: needs libX11/Xext/Xt/Xmu
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-10-06 10:04:20 +02:00
Thomas Petazzoni
478ea1a12d packages: remove unneeded _INSTALL_TARGET_OPT definitions
Now that <pkg>_INSTALL_TARGET_OPT always defaults to
'DESTDIR=$(TARGET_DIR) install', we can remove the
<pkg>_INSTALL_TARGET_OPT definition from a lot of packages.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-27 15:32:32 +02:00
Thomas Petazzoni
1976fc5f24 xlib_libX11: convert old-style hooks to new-style hooks
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-12 19:26:49 +02:00
Thomas Petazzoni
ef2c11e51a Remove unused X11_PREFIX option
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-28 00:30:26 +02:00
Thomas Petazzoni
a43e7e798c xserver: Add xkeyboard-config as a dependency
xkeyboard-config is required to install keymap files to the target,
without which the X server does not start.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-27 22:48:15 +02:00
Thomas Petazzoni
fb04640649 xserver: tell the X server where fonts are installed
All fonts are installed in /usr/share/fonts/X11 and not in
/usr/lib/X11/fonts/ where the X server looks by default.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-27 22:48:14 +02:00
Thomas Petazzoni
ee363f5231 xkeyboard-config: add dependency on host-xapp_xkbcomp
In order to get xkeyboard-config to build, it needs xkbcomp to be
built on the host, i.e host-xapp_xkbcomp. In turn, xapp_xkbcomp needs
xlib_libX11 and xlib_libxkbfile, which in turn need a few libraries.

This commit adds all the relevant dependencies to build everything
that is needed to get xkeyboard-config to build correctly.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-27 22:48:14 +02:00
Peter Korsgaard
c03cab1430 xserver-xorg: disable SDL kdrive server
Otherwise the build breaks if the SDL package is enabled, as xserver's
configure script detects SDL support, but doesn't find our sdl-config
script, so linking fails.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-24 20:34:03 +02:00
Peter Korsgaard
8bbf552993 xserver: dri support is only for the modular server
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-21 09:53:51 +02:00
Peter Korsgaard
fd5b0dc8fe xserver: libdrm is not needed for tinyx
libdrm is only needed for the modular server, and as libdrm
needs largefile support and tinyx doesn't, this dependency could
cause a build failure.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-20 23:29:42 +02:00
Peter Korsgaard
7be1fd6c68 xserver: libpciaccess is not needed for tinyx
libpciaccess is only needed for the modular server, and as libpciaccess
needs largefile support and tinyx doesn't, this dependency could
cause a build failure.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-20 16:07:12 +02:00
Thomas Petazzoni
ff15966c2e xlib_libXt: fix build issues
The .mk file was hacking the CC_FOR_BUILD value so that
$(STAGING_DIR)/usr/include is added to the include path. This is not
correct since $(STAGING_DIR) contains target stuff, not host
stuff. The correct fix is to add a dependency on host-xproto_xproto,
which will install the needed headers in $(HOST_DIR)/usr/include.

In addition to that, a patch is added to make xlib_libXt build system
behave properly in the cross-compilation case, where the makestrs tool
needs to be built on the host as part of the compilation process. This
was working before because of our quirky TARGET_CONFIGURE_OPTS, but
those are going to be fixed in a future commit.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-06 10:32:35 +02:00
Thomas Petazzoni
def6e3fd14 xcb-util: add dependency on host-gperf
gperf on the host is needed, since it is used by xcb-util to generate
a perfect hash function.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-07-06 10:32:35 +02:00
Peter Korsgaard
09b36fc064 xserver_xorg-server: fix _MAKE typo
The variable should be XSERVER_XORG_SERVER_MAKE, not .._XSERVER_MAKE.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-01 10:02:48 +02:00
Paul Jones
d74be05226 xkeyboard-config: Depends on host-intltool
Closes #1813

Signed-off-by: Paul Jones <paul@pauljones.id.au>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-08 22:40:41 +02:00
Peter Korsgaard
41c49b3c9f xserver_xorg-server: Use $(MAKE1) for make install
Xserver installation fails with parallel make jobs.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-30 20:13:45 +02:00
Peter Korsgaard
7f1bca8479 Revert "xserver_xorg-server: Use $(MAKE1) for make install"
This reverts commit b7acacaf6e.

Closes #1855

We DO need to install into staging for all the xdriver-* packages,
so revert this commit.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-30 20:12:52 +02:00
Paulius Zaleckas
b7acacaf6e xserver_xorg-server: Use $(MAKE1) for make install
Xserver installation fails with parallel make jobs.

Installation to staging is not needed. So just remove it
instead of converting to $(MAKE1).

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-28 22:47:52 +02:00
Paulius Zaleckas
b578f670d1 Remove locale dependency from xserver
XServer compiles just fine without locale support

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-28 22:00:42 +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
0d6068ae01 Merge branch 'misc-fixes2' of git://git.busybox.net/~tpetazzoni/git/buildroot 2010-05-08 00:09:11 +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
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