diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-01-28 15:50:13 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-12 19:33:24 +0100 |
| commit | 37a841321dca1314c9844d8d4665b5ff1e28a40f (patch) | |
| tree | fa18605b97edc9ae7517f0e06489e88e661f5b1e /meta-oe/recipes-devtools | |
| parent | 20a624928c030fa13d8b7d45b4f4d7e1ac624f60 (diff) | |
| download | meta-openembedded-37a841321dca1314c9844d8d4665b5ff1e28a40f.tar.gz | |
recipes: add x11 to required DISTRO_FEATURES
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
| -rw-r--r-- | meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb b/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb index 140456e17e..989f2cf515 100644 --- a/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb +++ b/meta-oe/recipes-devtools/python/python-pyqt_4.11.3.bb | |||
| @@ -22,7 +22,9 @@ S = "${WORKDIR}/PyQt-x11-gpl-${PV}" | |||
| 22 | 22 | ||
| 23 | PARALLEL_MAKE = "" | 23 | PARALLEL_MAKE = "" |
| 24 | 24 | ||
| 25 | inherit qmake2 pythonnative python-dir | 25 | inherit qmake2 pythonnative python-dir distro_features_check |
| 26 | # depends on qt4-x11-free | ||
| 27 | REQUIRED_DISTRO_FEATURES = "x11" | ||
| 26 | 28 | ||
| 27 | DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" | 29 | DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" |
| 28 | 30 | ||
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb index 1177d03688..14c6ce54c0 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb | |||
| @@ -35,7 +35,9 @@ S = "${WORKDIR}/${BPN}${PV}/unix" | |||
| 35 | VER = "${@os.path.splitext(d.getVar('PV', True))[0]}" | 35 | VER = "${@os.path.splitext(d.getVar('PV', True))[0]}" |
| 36 | 36 | ||
| 37 | LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" | 37 | LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" |
| 38 | inherit autotools | 38 | inherit autotools distro_features_check |
| 39 | # depends on virtual/libx11 | ||
| 40 | REQUIRED_DISTRO_FEATURES = "x11" | ||
| 39 | 41 | ||
| 40 | EXTRA_OECONF = "\ | 42 | EXTRA_OECONF = "\ |
| 41 | --enable-threads \ | 43 | --enable-threads \ |
