summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/uclibc/uclibc.inc44
1 files changed, 14 insertions, 30 deletions
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc
index e57ef174a9..5965c0b8bd 100644
--- a/packages/uclibc/uclibc.inc
+++ b/packages/uclibc/uclibc.inc
@@ -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']} \
file://uClibc.config"
-UCLIBC_PREFIX = "${CROSS_DIR}/${TARGET_SYS}"
-UCLIBC_STAGE_PREFIX = "${STAGING_DIR}/${HOST_SYS}"
+UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}"
# do_stage barfs on a CC with whitepspace, therefore put the 'HOST_CC_ARCH' in
# the CFLAGS (for when building the utils).
@@ -77,8 +76,8 @@ EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}'"
EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}"
EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}"
-KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}/include"
-KERNEL_HEADERS = "${CROSS_DIR}/${TARGET_SYS}/include"
+KERNEL_SOURCE = "${STAGING_INCDIR}"
+KERNEL_HEADERS = "${STAGING_INCDIR}"
# Lets munge this via siteinfo.bbclass as well:
# ARCH_BIG_ENDIAN=y
@@ -145,33 +144,18 @@ do_configure() {
}
do_stage() {
- # Install into the cross dir (this MUST be done first because we
- # will install crt1.o in the install_dev stage and gcc needs it)
- oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
- RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
- install_dev install_runtime
-
- 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 MUST be done first because we
+ # will install crt1.o in the install_dev stage and gcc needs it
- # 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}/ \
+ RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+ install_dev install_runtime
# Install into the staging dir
oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
- install_dev install_runtime install_utils
+ install_utils
# We don't really need this
rm -f ${UCLIBC_STAGE_PREFIX}/include/.cvsignore
@@ -188,11 +172,11 @@ do_stage() {
}
do_install() {
- # Install into the cross dir (this MUST be done first because we
+ # This MUST be done first because we
# will install crt1.o in the install_dev stage and gcc needs it)
- oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \
- RUNTIME_PREFIX=${UCLIBC_PREFIX}/ \
- install_dev install_runtime
+ oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+ RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+ install_dev install_runtime
oe_runmake PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
install_dev install_runtime