aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-05-19 23:04:33 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2015-10-13 17:40:08 +0200
commit82c66f0957008c012b125a3b5a7d5165ba92191e (patch)
tree5e997fd85ac6a9ebe426a7d8b98d3814a0ca1423
parentdf2f700d66bace65f5d802225232d01cf511fe81 (diff)
downloadmeta-openembedded-82c66f0957008c012b125a3b5a7d5165ba92191e.tar.gz
meta-openembedded-82c66f0957008c012b125a3b5a7d5165ba92191e.tar.bz2
meta-openembedded-82c66f0957008c012b125a3b5a7d5165ba92191e.zip
lirc: Make X support to be a packageconfig
When we dont have x11 in distro features it fails to build since libx11 dependency is not satisfied Change-Id: I6774a83f965551a41afe12b1304e44e73fc789c0 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-connectivity/lirc/lirc.inc2
-rw-r--r--meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb6
2 files changed, 5 insertions, 3 deletions
diff --git a/meta-oe/recipes-connectivity/lirc/lirc.inc b/meta-oe/recipes-connectivity/lirc/lirc.inc
index 77b6c282b..429bc45c0 100644
--- a/meta-oe/recipes-connectivity/lirc/lirc.inc
+++ b/meta-oe/recipes-connectivity/lirc/lirc.inc
@@ -6,7 +6,7 @@ DESCRIPTION_append_lirc-nslu2example = " This package contains a working config
HOMEPAGE = "http://www.lirc.org"
SECTION = "console/network"
LICENSE = "GPLv2"
-DEPENDS = "alsa-lib libftdi libusb1 libusb-compat jack portaudio-v19 libx11"
+DEPENDS = "alsa-lib libftdi libusb1 libusb-compat jack portaudio-v19"
PRIORITY = "optional"
SRC_URI = "http://prdownloads.sourceforge.net/lirc/lirc-${PV}.tar.bz2"
diff --git a/meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb b/meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb
index c3e61c49d..7d9375750 100644
--- a/meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb
+++ b/meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb
@@ -19,9 +19,11 @@ SYSTEMD_AUTO_ENABLE_lirc = "enable"
inherit autotools pkgconfig systemd pythonnative
-PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir"
+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd"
+PACKAGECONFIG[x11] = "--with-x,--with-x=no,libx11,"
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+PACKAGECONFIG_append = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}"
+PACKAGECONFIG_append = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' x11', '', d)}"
#EXTRA_OEMAKE = 'SUBDIRS="lib daemons tools"'
do_install_append() {