mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

uclibc: Only need to install to staging, not cross as well (after cross linkage changes)

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3120 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-11-12 11:14:24 +00:00
parent 98bd2b0d60
commit b176b023ac
2 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/uclibc/uclibc-initial_0.9.29.bb
+3 -7
View File
@@ -9,18 +9,14 @@ PACKAGES = ""
do_stage() { do_stage() {
# Install initial headers into the cross dir # Install initial headers into the cross dir
make PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \ make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \ RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
pregen install_dev pregen install_dev
mkdir -p ${CROSS_DIR}/${TARGET_SYS}
mkdir -p ${CROSS_DIR}/${TARGET_SYS}/include
mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
rm -rf ${CROSS_DIR}/${TARGET_SYS}/${prefix}
# This conflicts with the c++ version of this header # This conflicts with the c++ version of this header
rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
} }
do_install() { do_install() {
meta/packages/uclibc/uclibc.inc
+4 -25
View File
@@ -66,8 +66,7 @@ UCLIBC_LOCALE_URI_arm = "http://openembedded.org/dl/uclibc-locale/${UCLIBC_LOCAL
SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \ SRC_URI = "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
file://uClibc.config" file://uClibc.config"
UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}" UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}"
UCLIBC_STAGE_PREFIX = "${STAGING_DIR}/${HOST_SYS}"
# do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in # do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in
# the CFLAGS (for when building the utils). # the CFLAGS (for when building the utils).
@@ -145,34 +144,14 @@ do_configure() {
} }
do_stage() { do_stage() {
# Install into the cross dir (this MUST be done first because we oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
# will install crt1.o in the install_dev stage and gcc needs it) RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
install_dev install_runtime install_dev install_runtime
oe_runmake utils oe_runmake utils
oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
install_utils
# We don't really need this
rm -f ${UCLIBC_PREFIX}/include/.cvsignore
# Fixup shared lib symlinks
( cd ${UCLIBC_PREFIX}/lib
for f in c crypt dl m nsl pthread resolv thread_db util; do
ln -sf lib${f}.so.? lib${f}.so
done
)
# This conflicts with the c++ version of this header
rm -f ${UCLIBC_PREFIX}/include/bits/atomicity.h
# Install into the staging dir
oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
install_dev install_runtime install_utils install_utils
# We don't really need this # We don't really need this
rm -f ${UCLIBC_STAGE_PREFIX}/include/.cvsignore rm -f ${UCLIBC_STAGE_PREFIX}/include/.cvsignore