[oe] Mixed up STAGING_INCDIR's in uclibc.inc?

[Geoffrey Wossum]

Hi all,

I'm having a brand new issue building uClibc-0.9.29 for the AVR32.  When 
running do_configure for uclibc, it gets a bunch of errors like:

 
gcc -DCURSES_LOC="<ncurses.h>" -DLOCALE -I/home/geoff/lrs/playpaq/tmp/staging/avr32-angstrom-linux-uclibc/usr/include  -lncursesw 
conf.o  zconf.tab.o -o conf
| conf.o: In function `strip':
| conf.c:(.text+0x20): undefined reference to `__ctype_b'
| conf.c:(.text+0x97): undefined reference to `__ctype_b'
| conf.o: In function `conf_sym':
| conf.c:(.text+0x5bf): undefined reference to `__stdout'
...continues on...

I think the problem is the following line in packages/uclibc/uclibc.inc:
EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' HOSTCFLAGS='-I${STAGING_INCDIR}'"

Seems to me like that should be STAGING_INCDIR_NATIVE instead of 
STAGING_INCDIR.  If I make that change, then everything works again.

Does this seem correct? 

---
Geoffrey


#
# old_revision [b5af291fa9dc074af84727684ddae1efa9c1be0d]
#
# patch "packages/uclibc/uclibc.inc"
#  from [472f8824981d2a69ea009b1b57d42dfed1044151]
#    to [cc6432f05133f71d7aae488e59eb8a4423482666]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [e670b8966480e150375aa74c2bd62de6c8e5315b]
#    to [0eac903c662c67108b358b1ad2c6d1d976cc5419]
#
============================================================
--- packages/uclibc/uclibc.inc  472f8824981d2a69ea009b1b57d42dfed1044151
+++ packages/uclibc/uclibc.inc  cc6432f05133f71d7aae488e59eb8a4423482666
@@ -72,7 +72,7 @@ OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${L
 # the CFLAGS (for when building the utils).
 OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${LD}' \
                'LOCALE_DATA_FILENAME=${UCLIBC_LOCALE_FILE}'"
-EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' HOSTCFLAGS='-I${STAGING_INCDIR}'"
+EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' HOSTCFLAGS='-I${STAGING_INCDIR_NATIVE}'"
 EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}"
 EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}"

============================================================
--- packages/uclibc/uclibc_0.9.29.bb    e670b8966480e150375aa74c2bd62de6c8e5315b
+++ packages/uclibc/uclibc_0.9.29.bb    0eac903c662c67108b358b1ad2c6d1d976cc5419
@@ -7,7 +7,7 @@ UCLIBC_BASE ?= "0.9.29"
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.29"
-PR = "r13"
+PR = "r14"

 require uclibc.inc