diff options
author | Ross Burton <ross.burton@intel.com> | 2018-02-20 22:43:53 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-24 10:31:48 +0000 |
commit | 3abf75f923f4164aadd080596a47037a04bcc933 (patch) | |
tree | 6b34e39c440af1a4b73070bfbc3cc8251cc8364d /meta/recipes-graphics/xorg-proto/xcb-proto | |
parent | a63aa5c0e46b7dc7efb1be7272267fab93e2693e (diff) | |
download | poky-3abf75f923f4164aadd080596a47037a04bcc933.tar.gz |
xcb-proto: don't compile for Python 2
Remove the do_install_append to create the Python 2 pyc files, as nothing in the
build is using Python 2 anymore (libxcb is the only user, and that uses Python
3).
Also use variables instead of a patch to control what Python binary and path the
modules are installed to.
(From OE-Core rev: c27c60fe012bf42ea3b22fc1b4496450dc68b50b)
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, 0 insertions, 27 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 deleted file mode 100644 index 09b6088db0..0000000000 --- a/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
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="python3" | ||
24 | +AC_SUBST(PYTHON) | ||
25 | |||
26 | xcbincludedir='${datadir}/xcb' | ||
27 | AC_SUBST(xcbincludedir) | ||