diff options
| -rw-r--r-- | meta/classes/binconfig.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/bootimg.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/cpan.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/cross.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/distutils.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/mozilla.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/tmake.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/xlibs.bbclass | 4 |
8 files changed, 18 insertions, 18 deletions
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass index 497b78f454..4e425a76d6 100644 --- a/meta/classes/binconfig.bbclass +++ b/meta/classes/binconfig.bbclass @@ -16,8 +16,8 @@ def get_binconfig_mangle(d): s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" - s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'" - s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" + s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${layout_prefix}:'" + s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'" s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'" s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" return s @@ -33,7 +33,7 @@ do_install_append() { -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ -e 's:${STAGING_INCDIR}:${includedir}:g;' \ -e 's:${STAGING_DATADIR}:${datadir}:' \ - -e 's:${STAGING_LIBDIR}/..:${prefix}:' > ${D}${bindir}/`basename $config` + -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' > ${D}${bindir}/`basename $config` done fi @@ -42,7 +42,7 @@ do_install_append() { -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ -e 's:${STAGING_INCDIR}:${includedir}:g;' \ -e 's:${STAGING_DATADIR}:${datadir}:' \ - -e 's:${STAGING_LIBDIR}/..:${prefix}:' \ + -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' \ $lafile done } diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index 2d64ec1fa9..0c96001096 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass @@ -41,7 +41,7 @@ build_boot_bin() { install -m 0644 ${INITRD} ${HDDDIR}/initrd fi - install -m 444 ${STAGING_DIR}/${BUILD_SYS}/share/syslinux/ldlinux.sys \ + install -m 444 ${STAGING_DATADIR_NATIVE}/syslinux/ldlinux.sys \ ${HDDDIR}/ldlinux.sys # Do a little math, bash style @@ -75,7 +75,7 @@ build_boot_bin() { install -m 0644 ${INITRD} ${ISODIR}/initrd # And install the syslinux stuff - cp ${STAGING_DIR}/${BUILD_SYS}/share/syslinux/isolinux.bin \ + cp ${STAGING_DATADIR_NATIVE}/syslinux/isolinux.bin \ ${ISODIR} mkisofs -V ${BOOTIMG_VOLUME_ID} \ diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass index 3250528c7a..5a0b4a5c92 100644 --- a/meta/classes/cpan.bbclass +++ b/meta/classes/cpan.bbclass @@ -20,14 +20,14 @@ cpan_do_configure () { -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \ -e "s:\(INSTALLVENDORLIB = \).*:\1${D}${datadir}/perl5:" \ -e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" \ - -e "s:\(LDDLFLAGS.*\)${STAGING_DIR}/${BUILD_SYS}/lib:\1${STAGING_LIBDIR}:" \ + -e "s:\(LDDLFLAGS.*\)${STAGING_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \ Makefile else sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \ -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \ -e "s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \ -e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \ - -e "s:\(LDDLFLAGS.*\)${STAGING_DIR}/${BUILD_SYS}/lib:\1${STAGING_LIBDIR}:" \ + -e "s:\(LDDLFLAGS.*\)${STAGING_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \ Makefile fi fi diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass index 3588e2344a..6e5480a2a0 100644 --- a/meta/classes/cross.bbclass +++ b/meta/classes/cross.bbclass @@ -18,7 +18,7 @@ CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" CXXFLAGS = "${BUILD_CFLAGS}" LDFLAGS = "${BUILD_LDFLAGS}" -LDFLAGS_build-darwin = "-L${STAGING_DIR}/${BUILD_SYS}/lib " +LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}" # Overrides for paths diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index c07a9911cd..7a18e71c04 100644 --- a/meta/classes/distutils.bbclass +++ b/meta/classes/distutils.bbclass @@ -13,10 +13,10 @@ distutils_stage_headers() { } distutils_stage_all() { - install -d ${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages - PYTHONPATH=${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages \ + install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages + PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_INCDIR}/.. --install-data=${STAGING_INCDIR}/../share || \ + ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_DIR_HOST}${layout_prefix} --install-data=${STAGING_DATADIR} || \ oefatal "python setup.py install (stage) execution failed." } diff --git a/meta/classes/mozilla.bbclass b/meta/classes/mozilla.bbclass index 833bd2747c..be0a25e305 100644 --- a/meta/classes/mozilla.bbclass +++ b/meta/classes/mozilla.bbclass @@ -19,7 +19,7 @@ export MOZ_OBJDIR = "${S}" export CONFIGURE_ARGS = "${EXTRA_OECONF}" export HOST_LIBIDL_CFLAGS = "`${HOST_LIBIDL_CONFIG} --cflags`" export HOST_LIBIDL_LIBS = "`${HOST_LIBIDL_CONFIG} --libs`" -export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_DIR}/${BUILD_SYS}/share/pkgconfig pkg-config libIDL-2.0" +export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/pkgconfig pkg-config libIDL-2.0" export HOST_CC = "${BUILD_CC}" export HOST_CXX = "${BUILD_CXX}" export HOST_CFLAGS = "${BUILD_CFLAGS}" @@ -33,8 +33,8 @@ mozilla_do_configure() { set -e for cg in `find ${S} -name config.guess`; do install -m 0755 \ - ${STAGING_DIR}/${BUILD_SYS}/share/gnu-config/config.guess \ - ${STAGING_DIR}/${BUILD_SYS}/share/gnu-config/config.sub \ + ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess \ + ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub \ `dirname $cg`/ done ) diff --git a/meta/classes/tmake.bbclass b/meta/classes/tmake.bbclass index 05b82e496d..dbd0bf2763 100644 --- a/meta/classes/tmake.bbclass +++ b/meta/classes/tmake.bbclass @@ -54,7 +54,7 @@ python tmake_do_createpro() { } tmake_do_configure() { - paths="${STAGING_DATADIR}/tmake/qws/${TARGET_OS}-${TARGET_ARCH}-g++ $STAGING_DIR/share/tmake/$OS-g++" + paths="${STAGING_DATADIR}/tmake/qws/${TARGET_OS}-${TARGET_ARCH}-g++ ${STAGING_DATADIR}/tmake/$OS-g++" if (echo "${TARGET_ARCH}"|grep -q 'i.86'); then paths="${STAGING_DATADIR}/tmake/qws/${TARGET_OS}-x86-g++ $paths" fi diff --git a/meta/classes/xlibs.bbclass b/meta/classes/xlibs.bbclass index e797748770..ae8f928f1e 100644 --- a/meta/classes/xlibs.bbclass +++ b/meta/classes/xlibs.bbclass @@ -6,10 +6,10 @@ XLIBS_CVS = "${FREEDESKTOP_CVS}/xlibs" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ + oe_runmake install prefix=${STAGING_DIR_HOST}${layout_prefix} \ bindir=${STAGING_BINDIR} \ includedir=${STAGING_INCDIR} \ libdir=${STAGING_LIBDIR} \ datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DATADIR}/man + mandir=${STAGING_DIR_HOST}${layout_mandir} } |