summaryrefslogtreecommitdiffstats
path: root/meta/packages/uclibc
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-12 11:14:24 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-12 11:14:24 +0000
commitb176b023acc0d695f75dc7f7635c5def2f2fa5f4 (patch)
treebb38a6ff594cb702e82429fe40594c3cef19cf77 /meta/packages/uclibc
parent98bd2b0d60011a4f943a66fefdabd669ba229eb0 (diff)
downloadpoky-b176b023acc0d695f75dc7f7635c5def2f2fa5f4.tar.gz
uclibc: Only need to install to staging, not cross as well (after cross linkage changes)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3120 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/uclibc')
-rw-r--r--meta/packages/uclibc/uclibc-initial_0.9.29.bb10
-rw-r--r--meta/packages/uclibc/uclibc.inc29
2 files changed, 7 insertions, 32 deletions
diff --git a/meta/packages/uclibc/uclibc-initial_0.9.29.bb b/meta/packages/uclibc/uclibc-initial_0.9.29.bb
index 840acafeac..aa42fa3d19 100644
--- a/meta/packages/uclibc/uclibc-initial_0.9.29.bb
+++ b/meta/packages/uclibc/uclibc-initial_0.9.29.bb
@@ -9,18 +9,14 @@ PACKAGES = ""
9 9
10do_stage() { 10do_stage() {
11 # Install initial headers into the cross dir 11 # Install initial headers into the cross dir
12 make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \ 12 make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
13 RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \ 13 RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
14 pregen install_dev 14 pregen install_dev
15 15
16 mkdir -p ${CROSS_DIR}/${TARGET_SYS}
17 mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
18 mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
19 ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include 16 ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
20 rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
21 17
22 # This conflicts with the c++ version of this header 18 # This conflicts with the c++ version of this header
23 rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h 19 rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
24} 20}
25 21
26do_install() { 22do_install() {
diff --git a/meta/packages/uclibc/uclibc.inc b/meta/packages/uclibc/uclibc.inc
index 7fb8e5cf28..0a22ae0271 100644
--- a/meta/packages/uclibc/uclibc.inc
+++ b/meta/packages/uclibc/uclibc.inc
@@ -66,8 +66,7 @@ UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCAL
66SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \ 66SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
67 file://uClibc.config" 67 file://uClibc.config"
68 68
69UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}" 69UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}"
70UCLIBC_STAGE_PREFIX = "${STAGING_DIR}/${HOST_SYS}"
71 70
72# do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in 71# do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in
73# the CFLAGS (for when building the utils). 72# the CFLAGS (for when building the utils).
@@ -145,34 +144,14 @@ do_configure() {
145} 144}
146 145
147do_stage() { 146do_stage() {
148 # Install into the cross dir (this MUST be done first because we 147 oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
149 # will install crt1.o in the install_dev stage and gcc needs it) 148 RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
150 oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
151 RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
152 install_dev install_runtime 149 install_dev install_runtime
153 150
154 oe_runmake utils 151 oe_runmake utils
155 oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
156 RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
157 install_utils
158
159 # We don't really need this
160 rm -f ${UCLIBC_PREFIX}/include/.cvsignore
161
162 # Fixup shared lib symlinks
163 ( cd ${UCLIBC_PREFIX}/lib
164 for f in c crypt dl m nsl pthread resolv thread_db util; do
165 ln -sf lib${f}.so.? lib${f}.so
166 done
167 )
168
169 # This conflicts with the c++ version of this header
170 rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
171
172 # Install into the staging dir
173 oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ 152 oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
174 RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ 153 RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
175 install_dev install_runtime install_utils 154 install_utils
176 155
177 # We don't really need this 156 # We don't really need this
178 rm -f ${UCLIBC_STAGE_PREFIX}/include/.cvsignore 157 rm -f ${UCLIBC_STAGE_PREFIX}/include/.cvsignore