diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 6 | ||||
| -rw-r--r-- | classes/base.bbclass | 13 | ||||
| -rw-r--r-- | classes/bootimg.bbclass | 4 | ||||
| -rw-r--r-- | classes/cpan.bbclass | 4 | ||||
| -rw-r--r-- | classes/cross.bbclass | 2 | ||||
| -rw-r--r-- | classes/mozilla.bbclass | 6 | ||||
| -rw-r--r-- | classes/native.bbclass | 2 |
7 files changed, 18 insertions, 19 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index fccf2b6d80..8e4fba9400 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -97,9 +97,9 @@ autotools_do_configure() { AUTOV=`automake --version |head -n 1 |sed "s/.* //;s/\.[0-9]\+$//"` automake --version echo "AUTOV is $AUTOV" - install -d ${STAGING_DIR}/${HOST_SYS}/share/aclocal - install -d ${STAGING_DIR}/${HOST_SYS}/share/aclocal-$AUTOV - acpaths="$acpaths -I ${STAGING_DIR}/${HOST_SYS}/share/aclocal-$AUTOV -I ${STAGING_DIR}/${HOST_SYS}/share/aclocal" + install -d ${STAGING_DATADIR}/aclocal + install -d ${STAGING_DATADIR}/aclocal-$AUTOV + acpaths="$acpaths -I${STAGING_DATADIR}/aclocal-$AUTOV -I ${STAGING_DATADIR}/aclocal" # autoreconf is too shy to overwrite aclocal.m4 if it doesn't look # like it was auto-generated. Work around this by blowing it away # by hand, unless the package specifically asked not to run aclocal. diff --git a/classes/base.bbclass b/classes/base.bbclass index 2cf205fbe9..c504f78283 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -387,9 +387,6 @@ oe_machinstall() { fi } -# Remove and re-create ${D} so that is it guaranteed to be empty -do_install[cleandirs] = "${D}" - addtask listtasks do_listtasks[nostamp] = "1" python do_listtasks() { @@ -687,10 +684,10 @@ base_do_stage () { : } -do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${TARGET_SYS}/lib \ - ${STAGING_DIR}/${TARGET_SYS}/include \ - ${STAGING_DIR}/${BUILD_SYS}/bin ${STAGING_DIR}/${BUILD_SYS}/lib \ - ${STAGING_DIR}/${BUILD_SYS}/include \ +do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/bin ${STAGING_DIR_TARGET}/lib \ + ${STAGING_DIR_TARGET}/include \ + ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \ + ${STAGING_INCDIR_NATIVE} \ ${STAGING_DATADIR} \ ${S} ${B}" @@ -703,6 +700,8 @@ python do_populate_staging () { addtask install after do_compile do_install[dirs] = "${D} ${S} ${B}" +# Remove and re-create ${D} so that is it guaranteed to be empty +do_install[cleandirs] = "${D}" base_do_install() { : diff --git a/classes/bootimg.bbclass b/classes/bootimg.bbclass index 2d64ec1fa9..0c96001096 100644 --- a/classes/bootimg.bbclass +++ b/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/classes/cpan.bbclass b/classes/cpan.bbclass index 3250528c7a..5a0b4a5c92 100644 --- a/classes/cpan.bbclass +++ b/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/classes/cross.bbclass b/classes/cross.bbclass index 3588e2344a..a6b000cb6a 100644 --- a/classes/cross.bbclass +++ b/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/classes/mozilla.bbclass b/classes/mozilla.bbclass index bd8e9193d9..abf2bc7623 100644 --- a/classes/mozilla.bbclass +++ b/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_DATADIR_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/classes/native.bbclass b/classes/native.bbclass index 104d5a49da..d51c675909 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -27,7 +27,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} " STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}" STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}" |