summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-12 11:25:30 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-12 11:25:30 +0000
commit01d5da72d0bd5038ce4b6a211546a4ca3f8daffd (patch)
treeba1921d2beb66d9da21a5d6183c2c7db2bfc22a7 /meta/classes
parent8c1871aabfd2b010152886cb5b48a0be84c2dc80 (diff)
downloadpoky-01d5da72d0bd5038ce4b6a211546a4ca3f8daffd.tar.gz
Rearrange staging to match target system layout. This is a major change and will require a full rebuild.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3123 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/native.bbclass48
1 files changed, 21 insertions, 27 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 104d5a49da..d40a5028c9 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -27,7 +27,7 @@ CPPFLAGS = "${BUILD_CPPFLAGS}"
27CFLAGS = "${BUILD_CFLAGS}" 27CFLAGS = "${BUILD_CFLAGS}"
28CXXFLAGS = "${BUILD_CFLAGS}" 28CXXFLAGS = "${BUILD_CFLAGS}"
29LDFLAGS = "${BUILD_LDFLAGS}" 29LDFLAGS = "${BUILD_LDFLAGS}"
30LDFLAGS_build-darwin = "-L${STAGING_DIR}/${BUILD_SYS}/lib " 30LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE} "
31 31
32STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}" 32STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}"
33STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}" 33STAGING_BINDIR_CROSS = "${STAGING_BINDIR_NATIVE}"
@@ -47,39 +47,33 @@ export AS = "${HOST_PREFIX}as"
47export RANLIB = "${HOST_PREFIX}ranlib" 47export RANLIB = "${HOST_PREFIX}ranlib"
48export STRIP = "${HOST_PREFIX}strip" 48export STRIP = "${HOST_PREFIX}strip"
49 49
50
51# Path prefixes 50# Path prefixes
52base_prefix = "${exec_prefix}" 51export base_prefix = "${STAGING_DIR_NATIVE}"
53prefix = "${STAGING_DIR}" 52export prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
54exec_prefix = "${STAGING_DIR}/${BUILD_ARCH}-${BUILD_OS}" 53export exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
55 54
56# Base paths 55# Base paths
57base_bindir = "${base_prefix}/bin" 56export base_bindir = "${STAGING_DIR_NATIVE}${layout_base_bindir}"
58base_sbindir = "${base_prefix}/bin" 57export base_sbindir = "${STAGING_DIR_NATIVE}${layout_base_sbindir}"
59base_libdir = "${base_prefix}/lib" 58export base_libdir = "${STAGING_DIR_NATIVE}${layout_base_libdir}"
60 59
61# Architecture independent paths 60# Architecture independent paths
62sysconfdir = "${prefix}/etc" 61export datadir = "${STAGING_DIR_NATIVE}${layout_datadir}"
63sharedstatedir = "${prefix}/com" 62export sysconfdir = "${STAGING_DIR_NATIVE}${layout_sysconfdir}"
64localstatedir = "${prefix}/var" 63export sharedstatedir = "${STAGING_DIR_NATIVE}${layout_sharedstatedir}"
65infodir = "${datadir}/info" 64export localstatedir = "${STAGING_DIR_NATIVE}${layout_localstatedir}"
66mandir = "${datadir}/man" 65export infodir = "${STAGING_DIR_NATIVE}${layout_infodir}"
67docdir = "${datadir}/doc" 66export mandir = "${STAGING_DIR_NATIVE}${layout_mandir}"
68servicedir = "${prefix}/srv" 67export docdir = "${STAGING_DIR_NATIVE}${layout_docdir}"
68export servicedir = "${STAGING_DIR_NATIVE}${layout_servicedir}"
69 69
70# Architecture dependent paths 70# Architecture dependent paths
71bindir = "${exec_prefix}/bin" 71export bindir = "${STAGING_DIR_NATIVE}${layout_bindir}"
72sbindir = "${exec_prefix}/bin" 72export sbindir = "${STAGING_DIR_NATIVE}${layout_sbindir}"
73libexecdir = "${exec_prefix}/libexec" 73export libexecdir = "${STAGING_DIR_NATIVE}${layout_libexecdir}"
74libdir = "${exec_prefix}/lib" 74export libdir = "${STAGING_DIR_NATIVE}${layout_libdir}"
75includedir = "${exec_prefix}/include" 75export includedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
76oldincludedir = "${exec_prefix}/include" 76export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
77
78# Datadir is made arch dependent here, primarily
79# for autoconf macros, and other things that
80# may be manipulated to handle crosscompilation
81# issues.
82datadir = "${exec_prefix}/share"
83 77
84do_stage () { 78do_stage () {
85 if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ] 79 if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ]