uclibc: Pass ARCH=<TARGET_ARCH>" on make commandline.
PATCH 1/1 uclibc: Pass ARCH=<TARGET_ARCH>" on make commandline.
Like linux kernel Git version of uclibc mandates that ARCH is passed down from make instead of being computed magically. This will be there in next release 0.9.31 of uclibc. Defining it on make invocation for older releases is no harm.
Also move uclibc to use INC_PR
Signed-off-by Khem Raj <[email protected]>
--- recipes/uclibc/bfin-uclibc_svn.bb | 3 +-- recipes/uclibc/uclibc.inc | 4 +++- recipes/uclibc/uclibc_0.9.28.bb | 3 +-- recipes/uclibc/uclibc_0.9.29.bb | 2 +- recipes/uclibc/uclibc_0.9.30.1.bb | 2 +- recipes/uclibc/uclibc_0.9.30.bb | 2 +- recipes/uclibc/uclibc_git.bb | 3 +-- recipes/uclibc/uclibc_nptl.bb | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-)
recipes/uclibc/bfin-uclibc_svn.bb +1 -2
@@ -7,11 +7,10 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r5" PV = "${UCLIBC_BASE}+svnr${SRCREV}" require uclibc.inc - +PR = "${INC_PR}.0" PROVIDES_append_bfin = " virtual/${TARGET_PREFIX}libc-for-gcc " #recent versions uclibc require real kernel headers
recipes/uclibc/uclibc.inc +3 -1
@@ -2,6 +2,7 @@ DESCRIPTION = "C library for embedded systems" LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" +INC_PR = "r32" # # For now, we will skip building of a gcc package if it is a uclibc one # and our build is not a uclibc one, and we skip a glibc one if our build
@@ -79,7 +80,8 @@ UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}" OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${LD}' \ 'LOCALE_DATA_FILENAME=${UCLIBC_LOCALE_FILE}'" EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' \ - 'HOSTCFLAGS=-I${STAGING_INCDIR_NATIVE}'" + 'HOSTCFLAGS=-I${STAGING_INCDIR_NATIVE}' \ + ARCH=`grep TARGET_ARCH ${S}/.config|sed -e 's/TARGET_ARCH=//g'`" EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}" KERNEL_SOURCE = "${STAGING_INCDIR}"
recipes/uclibc/uclibc_0.9.28.bb +1 -2
@@ -1,6 +1,5 @@ -PR = "r18" - require uclibc.inc +PR = "${INC_PR}.0" # This is the correct KERNEL_SOURCE location, if the uClibc # fix_includes.sh script is run (see nokernelheader.patch below)
recipes/uclibc/uclibc_0.9.29.bb +1 -1
@@ -7,9 +7,9 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r31" require uclibc.inc +PR = "${INC_PR}.0" PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
recipes/uclibc/uclibc_0.9.30.1.bb +1 -1
@@ -7,9 +7,9 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.30.1" -PR = "r4" require uclibc.inc +PR = "${INC_PR}.0" PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
recipes/uclibc/uclibc_0.9.30.bb +1 -1
@@ -7,9 +7,9 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.30" -PR = "r7" require uclibc.inc +PR = "${INC_PR}.0" PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
recipes/uclibc/uclibc_git.bb +1 -2
@@ -9,13 +9,12 @@ UCLIBC_BASE ?= "0.9.30" SRCREV="6625518cd6894338937a74ca6b9187b7b8167b03" PV = "${UCLIBC_BASE}+gitr${SRCREV}" -PR = "r1" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. require uclibc.inc - +PR = "${INC_PR}.0" PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" #recent versions uclibc require real kernel headers
recipes/uclibc/uclibc_nptl.bb +1 -1
@@ -9,12 +9,12 @@ UCLIBC_BASE ?= "0.9.30" SRCREV="d57e6548d253a9efed91d72498aeda092fa265d2" PV = "${UCLIBC_BASE}+gitr${SRCREV}" -PR = "r1" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. require uclibc.inc +PR = "${INC_PR}.0" PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
Signature · 1 line
1.6.3.3