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-27 11:26:59 +0000 |
| commit | bc38ef47b05128623a916172c2cfd244510b201e (patch) | |
| tree | c8e350eb97de3107ab5d555df116d9d1aa56a075 /meta/recipes-graphics/xorg-proto | |
| parent | 3ec457e7cdc347a98ab561fd3d2a500a218cdeb0 (diff) | |
| download | openembedded-core-contrib-bc38ef47b05128623a916172c2cfd244510b201e.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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-proto')
| -rw-r--r-- | meta/recipes-graphics/xorg-proto/xcb-proto.inc | 9 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch | 27 |
2 files changed, 32 insertions, 4 deletions
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto.inc b/meta/recipes-graphics/xorg-proto/xcb-proto.inc index 2e1b57bae4..8703d6391c 100644 --- a/meta/recipes-graphics/xorg-proto/xcb-proto.inc +++ b/meta/recipes-graphics/xorg-proto/xcb-proto.inc @@ -9,17 +9,18 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" SECTION = "x11/libs" LICENSE = "MIT-X" -SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \ + file://no-python-native.patch" -inherit autotools pkgconfig pythonnative +inherit autotools pkgconfig PACKAGES += "python-xcbgen" +FILES_${PN} = "" FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" -FILES_python-xcbgen = "${libdir}/python*" +FILES_python-xcbgen = "${libdir}/xcb-proto" RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" -DEPENDS_append_class-native = " python-native" BBCLASSEXTEND = "native nativesdk" 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 @@ +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="python" ++AC_SUBST(PYTHON) + + xcbincludedir='${datadir}/xcb' + AC_SUBST(xcbincludedir) |