diff options
| -rw-r--r-- | meta/conf/bitbake.conf | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 840d88c58f..4292395bf6 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -167,18 +167,26 @@ S = "${WORKDIR}/${P}" B = "${S}" STAGING_DIR = "${TMPDIR}/staging" -STAGING_BINDIR = "${STAGING_DIR}/${HOST_SYS}/bin" -STAGING_BINDIR_CROSS = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}" -STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin" -STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib" -STAGING_LIBDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/lib" -STAGING_ETCDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/etc" -STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include" -STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share" -STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader" -STAGING_FIRMWARE_DIR = "${STAGING_DIR}/${HOST_SYS}/firmware" + +STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" +STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}/bin" +STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}/bin/${HOST_SYS}" +STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}/lib" +STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}/include" +STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}/etc" +STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}/share" + +STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}" +STAGING_BINDIR = "${STAGING_DIR_HOST}/bin" +STAGING_LIBDIR = "${STAGING_DIR_HOST}/lib" +STAGING_INCDIR = "${STAGING_DIR_HOST}/include" +STAGING_DATADIR = "${STAGING_DIR_HOST}/share" +STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" +STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" +STAGING_DIR_TARGET = "${STAGING_DIR}/${TARGET_SYS}" + DEPLOY_DIR = "${TMPDIR}/deploy" DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk" @@ -197,7 +205,7 @@ SDK_PREFIX = "/usr/local/${SDK_NAME}" ################################################################## OLDEST_KERNEL = "2.4.0" -STAGING_KERNEL_DIR = "${STAGING_DIR}/${HOST_SYS}/kernel" +STAGING_KERNEL_DIR = "${STAGING_DIR_HOST}/kernel" ################################################################## # Specific image creation and rootfs population info. @@ -290,9 +298,9 @@ PATCHRESOLVE = 'user' # Build flags and options. ################################################################## -export BUILD_CPPFLAGS = "-isystem${STAGING_DIR}/${BUILD_SYS}/include" +export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}" export CPPFLAGS = "${TARGET_CPPFLAGS}" -export TARGET_CPPFLAGS = "-isystem${STAGING_DIR}/${TARGET_SYS}/include" +export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}/include" export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}" export CFLAGS = "${TARGET_CFLAGS}" @@ -302,12 +310,12 @@ export BUILD_CXXFLAGS = "${BUILD_CFLAGS} -fpermissive" export CXXFLAGS = "${TARGET_CXXFLAGS}" export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive" -export BUILD_LDFLAGS = "-L${STAGING_DIR}/${BUILD_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${BUILD_SYS}/lib \ - -Wl,-rpath,${STAGING_DIR}/${BUILD_SYS}/lib -Wl,-O1" +export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \ + -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \ + -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1" export LDFLAGS = "${TARGET_LDFLAGS}" -export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ - -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib \ +export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}/lib \ + -Wl,-rpath-link,${STAGING_DIR_TARGET}/lib \ -Wl,-O1" # Which flags to leave by strip-flags() in bin/build/oebuild.sh ? @@ -336,9 +344,9 @@ BOOTSTRAP_EXTRA_RRECOMMENDS = "" # Palmtop stuff. ################################################################## -export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2" -export QPEDIR = "${STAGING_DIR}/${HOST_SYS}" -export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}" +export QTDIR = "${STAGING_DIR_HOST}/qt2" +export QPEDIR = "${STAGING_DIR_HOST}" +export OPIEDIR = "${STAGING_DIR_HOST}" export palmtopdir = "${libdir}/opie" export palmqtdir = "${palmtopdir}" @@ -440,8 +448,8 @@ export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig" export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" -export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake" -export STAGING_SIPDIR = "${STAGING_DIR}/${BUILD_SYS}/share/sip" +export QMAKE_MKSPEC_PATH = "${STAGING_DATADIR_NATIVE}/qmake" +export STAGING_SIPDIR = "${STAGING_DATADIR_NATIVE}/sip" export STAGING_IDLDIR = "${STAGING_DATADIR}/idl" # library package naming |