diff options
author | Ross Burton <ross.burton@intel.com> | 2015-12-11 15:08:57 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-28 09:25:17 +0000 |
commit | 8df88fb3c528c974fa55af42c064e06d615646de (patch) | |
tree | f34f262bfa72ba967ccd30838cb34a51e74b7bdc /meta/recipes-graphics/xorg-proto/xcb-proto | |
parent | d7759a5b433186c95af02c7d61ccaecf38191b74 (diff) | |
download | poky-8df88fb3c528c974fa55af42c064e06d615646de.tar.gz |
xcb: don't build-depend on python-native
xcb-proto had a dependency on python-native as it builds and installs a Python
module, but xcb-proto is very low in the build to force a dependency on
python-native.
As it turns out libxcb simply asks pkg-config for the full path to the module
xcb-proto installed and uses it directly so there is no need to build
python-native. Instead replace AM_PATH_PYTHON with two explicit variable
definitions (need to set PYTHON for automake's install logic).
Also remove the dependency on xcb-proto-native as libxcb uses the data files and
tooling from the target sysroot, and patching it to use the native sysroot adds
complication for no good reason.
(From OE-Core rev: bc38ef47b05128623a916172c2cfd244510b201e)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-proto/xcb-proto')
-rw-r--r-- | meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch b/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch new file mode 100644 index 0000000000..f808e1963b --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | Upstream uses AM_PATH_PYTHON to find a python binary and ask it where to install | ||
2 | libraries. This means we either need to depend on python-native (large build | ||
3 | dependency, early in the build) or use the host python (pythondir reflects the | ||
4 | host and not the target, breaks builds). | ||
5 | |||
6 | The third option is to just hardcode the path where the module goes, as most | ||
7 | callers of the code use pkg-config to find where it was installed anyway. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
11 | |||
12 | diff --git a/configure.ac b/configure.ac | ||
13 | index d140bfe..c7b68da 100644 | ||
14 | --- a/configure.ac | ||
15 | +++ b/configure.ac | ||
16 | @@ -14,7 +14,10 @@ if test "$XMLLINT" = "no"; then | ||
17 | AC_MSG_WARN([xmllint not found; unable to validate against schema.]) | ||
18 | fi | ||
19 | |||
20 | -AM_PATH_PYTHON([2.5]) | ||
21 | +pythondir="${libdir}/xcb-proto" | ||
22 | +AC_SUBST(pythondir) | ||
23 | +PYTHON="python" | ||
24 | +AC_SUBST(PYTHON) | ||
25 | |||
26 | xcbincludedir='${datadir}/xcb' | ||
27 | AC_SUBST(xcbincludedir) | ||