From e47a5daa4ff837abf7ef6a1ed3f702381ba82bb1 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Wed, 4 Jan 2012 13:09:08 +0000 Subject: bitbake.conf: remove some redundant/unnecessary variable exports Specifically... SLOT: apparently redundant, deleted. STAGING_IDLDIR: likewise QMAKE_MKSPEC_PATH: no longer exported, moved to qmake_base.bbclass STAGING_SIPDIR: no longer exported, moved to sip.bbclass (From OE-Core rev: 3dcbc8a700a3e7474026e858b1d20e9ff89a5eb1) Signed-off-by: Phil Blundell Signed-off-by: Richard Purdie --- meta/classes/qmake_base.bbclass | 1 + meta/classes/sip.bbclass | 2 ++ meta/conf/bitbake.conf | 7 ------- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'meta') diff --git a/meta/classes/qmake_base.bbclass b/meta/classes/qmake_base.bbclass index b61b84c7f7..d1008b638b 100644 --- a/meta/classes/qmake_base.bbclass +++ b/meta/classes/qmake_base.bbclass @@ -1,3 +1,4 @@ +QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/qmake" OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" diff --git a/meta/classes/sip.bbclass b/meta/classes/sip.bbclass index de0e2effb1..3a00e4dbd8 100644 --- a/meta/classes/sip.bbclass +++ b/meta/classes/sip.bbclass @@ -1,6 +1,8 @@ # Build Class for Sip based Python Bindings # (C) Michael 'Mickey' Lauer # +STAGING_SIPDIR ?= "${STAGING_DATADIR_NATIVE}/sip" + DEPENDS =+ "sip-native" RDEPENDS += "python-sip" diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 1c2161682c..b8583646a0 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -606,9 +606,6 @@ export PATCH_GET="0" # Not sure about the rest of this yet. ################################################################## -# slot - currently unused by OE. portage remnants -SLOT = "0" - # Other export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}/${libdir}/pkgconfig" @@ -617,10 +614,6 @@ export PKG_CONFIG_LIBDIR = "${PKG_CONFIG_DIR}" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" -export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake" -export STAGING_SIPDIR = "${STAGING_DATADIR_NATIVE}/sip" -export STAGING_IDLDIR = "${STAGING_DATADIR}/idl" - # library package naming AUTO_LIBNAME_PKGS = "${PACKAGES}" -- cgit v1.2.3-54-g00ecf