To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
In preparation for the out-of-tree support, it is important that all
packages have the same patch hooks for the host variant and the target
variant (because the source tree will be shared between host and
target variants when doing out-of-tree build).
In the case of the xlib_libX11 package, the post-patch hook removes
some flags from the build of the makekeys utility, so that when
xlib_libX11 is built for the target, the build of makekeys for the
host works properly. This modification can be applied to the host
variant of xlib_libX11 without any problem.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
The BR2_PACKAGE_XPROTO_BIGREQSPROTO option was selected by
xlib_libX11, but xlib_libX11 does not have this protocol package in
its DEPENDENCIES. In some builds, it leads to xproto_bigreqsproto to
be built as the last package, with no other package depending on it,
which doesn't make sense.
xproto_xcmiscproto was selected and part of DEPENDENCIES, but an
inspection of libX11 configure.ac and libX11 source code shows that it
does not depend on xcmiscproto at all.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
xlib_libX11 builds a makekeys executable for the host, but uses the
targets X11_CFLAGS. This leads to build failures like
http://autobuild.buildroot.net/results/411eb3aefea859a7e31986a44acd50b475f174cb/
This problem was introduced by the version bump, because then also
the AUTORECONF was removed so the existing fix didn't work anymore.
As a slightly cleaner solution, just remove X11_CFLAGS from the
Makefile. We know we don't need it, because the X11 stuff is in
$(HOST_DIR)/usr/include which is already in HOST_CFLAGS.
[Peter: reword comments]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
[Peter: AUTORECONF and --with-keysymdef no longer needed]
Signed-off-by: Allan W. Nielsen <a@awn.dk>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
By deriving HOST_XLIB_LIBX11_DEPENDENCIES from XLIB_LIBX11_DEPENDENCIES, it
turned out that that one had a redundant dependency on xproto_bigreqsproto.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Thanks to the pkgparentdir and pkgname functions, we can rewrite the
AUTOTARGETS macro in a way that avoids the need for each package to
repeat its name and the directory in which it is present.
[Peter: pkgdir->pkgparentdir]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Now that those values are passed at the autotools infrastructure
level, there's no need for every package to pass inconsistent values.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
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>
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>
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>
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>
As discussed on the list, don't want to have to change the Config.in
file when we bump the version of a package
Signed-off-by: Will Wagner <will_wagner@carallon.com>
Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Closes#1387
The documentation step needs working groff and ps2pdf on the host, and
only slows down the build, so just disable it.
At the same time, cleanup the overlong _CONF_OPT line.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Those are already in TARGET_CONFIGURE_ARGS. Also get rid of unused
BR2_AC_CV_FUNC_MALLOC_0_NONNULL variable.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
quite work yet for me, but this clearly is a huge project and not having it
quite work on the first pass is hardly unexpected. We definately want this
stuff in buildroot.
