summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-01-04 13:09:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-04 14:14:10 +0000
commite47a5daa4ff837abf7ef6a1ed3f702381ba82bb1 (patch)
tree17726cdcf3eae6267f1819b559d991608114673f
parentc4de612298266653130dd2e5b8378f62dda77e9f (diff)
downloadpoky-e47a5daa4ff837abf7ef6a1ed3f702381ba82bb1.tar.gz
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 <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/qmake_base.bbclass1
-rw-r--r--meta/classes/sip.bbclass2
-rw-r--r--meta/conf/bitbake.conf7
3 files changed, 3 insertions, 7 deletions
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 @@
1QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/qmake"
1 2
2OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" 3OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++"
3QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" 4QMAKESPEC := "${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 @@
1# Build Class for Sip based Python Bindings 1# Build Class for Sip based Python Bindings
2# (C) Michael 'Mickey' Lauer <mickey@Vanille.de> 2# (C) Michael 'Mickey' Lauer <mickey@Vanille.de>
3# 3#
4STAGING_SIPDIR ?= "${STAGING_DATADIR_NATIVE}/sip"
5
4DEPENDS =+ "sip-native" 6DEPENDS =+ "sip-native"
5RDEPENDS += "python-sip" 7RDEPENDS += "python-sip"
6 8
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"
606# Not sure about the rest of this yet. 606# Not sure about the rest of this yet.
607################################################################## 607##################################################################
608 608
609# slot - currently unused by OE. portage remnants
610SLOT = "0"
611
612# Other 609# Other
613 610
614export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}/${libdir}/pkgconfig" 611export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}/${libdir}/pkgconfig"
@@ -617,10 +614,6 @@ export PKG_CONFIG_LIBDIR = "${PKG_CONFIG_DIR}"
617export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" 614export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
618export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" 615export PKG_CONFIG_DISABLE_UNINSTALLED = "yes"
619 616
620export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake"
621export STAGING_SIPDIR = "${STAGING_DATADIR_NATIVE}/sip"
622export STAGING_IDLDIR = "${STAGING_DATADIR}/idl"
623
624# library package naming 617# library package naming
625AUTO_LIBNAME_PKGS = "${PACKAGES}" 618AUTO_LIBNAME_PKGS = "${PACKAGES}"
626 619