diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-10-01 18:30:22 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-10-01 18:30:22 +0000 |
| commit | addb38f7ab4eb2e58d5253eb955129dbb97f761d (patch) | |
| tree | 115866c27e609a6f4b1caa7f1f9594e63b19705c /classes | |
| parent | 33ff72afbfd5e5dc3ef4dbdff78c2dc03fbb5427 (diff) | |
| parent | 2a51c06c2cd87c48d1c273a8cdd53c009f57ea6d (diff) | |
merge of '4f2b8fbe38be5a535656d7d00413d303f9a4975d'
and 'd3b1203776970588892a46acdd9df1e18c0c5d37'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cross.bbclass | 11 | ||||
| -rw-r--r-- | classes/packaged-staging.bbclass | 2 | ||||
| -rw-r--r-- | classes/qmake2.bbclass | 1 |
3 files changed, 9 insertions, 5 deletions
diff --git a/classes/cross.bbclass b/classes/cross.bbclass index a35f4dfb79..9dddca127a 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -3,8 +3,11 @@ EXCLUDE_FROM_WORLD = "1" # Save PACKAGE_ARCH before changing HOST_ARCH -OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} -PACKAGE_ARCH = ${OLD_PACKAGE_ARCH} +OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}" +PACKAGE_ARCH = "${OLD_PACKAGE_ARCH}" +# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it +OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}" +BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}" PACKAGES = "" @@ -49,8 +52,8 @@ bindir = "${exec_prefix}/bin" sbindir = "${exec_prefix}/bin" libexecdir = "${exec_prefix}/libexec" libdir = "${exec_prefix}/lib" -includedir = "${STAGING_DIR_TARGET}/${layout_includedir}" -oldincludedir = "${STAGING_DIR_TARGET}/${layout_includedir}" +includedir = "${exec_prefix}/include" +oldincludedir = "${exec_prefix}/include" do_stage () { oe_runmake install diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 70550c1a7d..ed94790b1d 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -157,7 +157,7 @@ staging_helper () { fi if [ ! -e ${TMPDIR}${layout_libdir}/ipkg/ ]; then cd ${TMPDIR}${layout_libdir}/ - ln -s opkg/ ipkg + ln -sf opkg/ ipkg fi } diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 9ac4945ab4..8a443d062a 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -10,6 +10,7 @@ export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4" export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4" +export QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4" export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2" export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" |