[oe-commits] org.oe.dev uclibc: Clean up so only one set of headers are staged and better staging variables are used

[rpurdie commit]

uclibc: Clean up so only one set of headers are staged and better staging variables are used

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 837d64a31b8abfdc562d904e813817330322a752
ViewMTN: http://monotone.openembedded.org/revision/info/837d64a31b8abfdc562d904e813817330322a752
Files:
1
packages/uclibc/uclibc.inc
Diffs:

#
# mt diff -r30b674cf4c36edad303d41edce8735cc617835da -r837d64a31b8abfdc562d904e813817330322a752
#
# 
# 
# patch "packages/uclibc/uclibc.inc"
#  from [c9c79ae76287d39c4c0f25cd721cd57d7f5305bb]
#    to [de423804aa3669733b033b1a6d9f50c7e3d07d41]
# 
============================================================
--- packages/uclibc/uclibc.inc	c9c79ae76287d39c4c0f25cd721cd57d7f5305bb
+++ packages/uclibc/uclibc.inc	de423804aa3669733b033b1a6d9f50c7e3d07d41
@@ -66,8 +66,7 @@ SRC_URI = "${@['${UCLIBC_LOCALE_URI}', '
 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_task_do_package = "${OEMAKE
 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_stage() {
 }
 
 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
+	# 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_utils
+	# Install into the staging dir
+	oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+		install_dev install_runtime
 
-	# 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}/ \
 		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_install() {
 }
 
 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