From 006b8a7808a58713af16c326dc37d07765334b12 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 27 Feb 2014 18:01:44 +0000 Subject: autotools-brokensep: Mark recipes with broken separate build dir support This patch goes through the OE-Core recipes and marks those which use autotools but don't support a separate build directory (${S} != ${B}). A new class, autotools-brokensep is used for this purpose. This doesn't introduce any change in behaviour in its own right. Signed-off-by: Richard Purdie --- meta/recipes-graphics/freetype/freetype_2.5.2.bb | 2 +- meta/recipes-graphics/mx/mx.inc | 2 +- meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 2 +- meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | 2 +- meta/recipes-graphics/xorg-proto/presentproto_git.bb | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/freetype/freetype_2.5.2.bb b/meta/recipes-graphics/freetype/freetype_2.5.2.bb index 2521b5e691..b93453ae59 100644 --- a/meta/recipes-graphics/freetype/freetype_2.5.2.bb +++ b/meta/recipes-graphics/freetype/freetype_2.5.2.bb @@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c S = "${WORKDIR}/freetype-${PV}" -inherit autotools pkgconfig binconfig +inherit autotools-brokensep pkgconfig binconfig LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc index 0b02c10627..ee7f18623c 100644 --- a/meta/recipes-graphics/mx/mx.inc +++ b/meta/recipes-graphics/mx/mx.inc @@ -1,7 +1,7 @@ SUMMARY = "Clutter based UI widget library" LICENSE = "LGPLv2.1" -inherit clutter +inherit clutter autotools-brokensep DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf" diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb index 162c2dd6b5..9785a162e0 100644 --- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb +++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst" -inherit autotools +inherit autotools-brokensep PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi" diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index 783bcd7e1e..3f97e197ad 100644 --- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb @@ -21,7 +21,7 @@ EXTRA_OECONF += "--with-gui=x11" do_install_append() { install -d ${D}${bindir} - install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh + install -m 0755 ${S}/scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh install -d ${D}${sysconfdir}/X11/Xsession.d/ install -m 0755 ${WORKDIR}/30xinput_calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ diff --git a/meta/recipes-graphics/xorg-proto/presentproto_git.bb b/meta/recipes-graphics/xorg-proto/presentproto_git.bb index bd6c60a82d..7fca51d31e 100644 --- a/meta/recipes-graphics/xorg-proto/presentproto_git.bb +++ b/meta/recipes-graphics/xorg-proto/presentproto_git.bb @@ -17,4 +17,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/presentproto" S = "${WORKDIR}/git" +inherit autotools-brokensep + BBCLASSEXTEND = "native" -- cgit 1.2.3-korg