diff options
3 files changed, 22 insertions, 30 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 09b6088db0a..00000000000 --- a/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream uses AM_PATH_PYTHON to find a python binary and ask it where to install -libraries. This means we either need to depend on python-native (large build -dependency, early in the build) or use the host python (pythondir reflects the -host and not the target, breaks builds). - -The third option is to just hardcode the path where the module goes, as most -callers of the code use pkg-config to find where it was installed anyway. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/configure.ac b/configure.ac -index d140bfe..c7b68da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,7 +14,10 @@ if test "$XMLLINT" = "no"; then - AC_MSG_WARN([xmllint not found; unable to validate against schema.]) - fi - --AM_PATH_PYTHON([2.5]) -+pythondir="${libdir}/xcb-proto" -+AC_SUBST(pythondir) -+PYTHON="python3" -+AC_SUBST(PYTHON) - - xcbincludedir='${datadir}/xcb' - AC_SUBST(xcbincludedir) diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto/pythondir.patch b/meta/recipes-graphics/xorg-proto/xcb-proto/pythondir.patch new file mode 100644 index 00000000000..ab25901797b --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xcb-proto/pythondir.patch @@ -0,0 +1,19 @@ +Do not ask python where to install modules, instead hardcode the path. +Most callers of the code use pkg-config to find where it was installed anyway. + +Upstream-Status: Inappropriate +Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> + +diff --git a/configure.ac b/configure.ac +index d140bfe..c7b68da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,8 @@ + + AM_PATH_PYTHON([2.5]) + ++pythondir="${libdir}/xcb-proto" ++AC_SUBST(pythondir) + xcbincludedir='${datadir}/xcb' + AC_SUBST(xcbincludedir) + diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb index be6b1a0200e..61693bf4788 100644 --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb @@ -12,14 +12,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \ - file://no-python-native.patch \ + file://pythondir.patch \ file://0001-Make-whitespace-use-consistent.patch \ file://0002-print-is-a-function-and-needs-parentheses.patch \ " SRC_URI[md5sum] = "14e60919f859560f28426a685a555962" SRC_URI[sha256sum] = "5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c480a4906" -inherit autotools pkgconfig +inherit autotools pkgconfig python3native PACKAGES += "python-xcbgen" @@ -36,5 +36,5 @@ do_install_append() { # Makefile's do_install creates .pyc files for python3, now also create # them for python2 so that they will be recorded by manifest, and can be # cleaned correctly. - (cd ${D}; python -m py_compile ./${libdir}/xcb-proto/xcbgen/*.py) + (cd ${D}; python3 -m py_compile ./${libdir}/xcb-proto/xcbgen/*.py) } |