On Fri, Aug 17, 2012 at 7:10 AM, Richard Purdie <richard.pur...@linuxfoundation.org> wrote: > On Thu, 2012-08-16 at 18:12 -0500, Matthew McClintock wrote: >> | gcc >> -isystem/home/mattsm/git/poky/build-master/tmp/sysroots/x86_64-linux/usr/include >> >> -isystem/home/mattsm/git/poky/build-master/tmp/sysroots/x86_64-linux/usr/include >> -O2 -pipe -DNOT_IN_libc=1 -DNO_SYSCONF -DNO_UNCOMPRESS >> -DLOCALE_PATH='"/usr/local/lib/locale:/usr/local/share/i18n"' >> -DLOCALEDIR='"/usr/local/lib/locale"' >> -DLOCALE_ALIAS_PATH='"/usr/local/share/locale"' >> -DCHARMAP_PATH='"/usr/local/share/i18n/charmaps"' >> -DREPERTOIREMAP_PATH='"/usr/local/share/i18n/repertoiremaps"' >> -DLOCSRCDIR='"/usr/local/share/i18n/locales"' -DNOT_IN_libc >> -DIN_GLIBC_LOCALEDEF -Iglibc/locale/programs -I./include -Iglibc/locale -I. >> -I. -include ./include/always.h -Wall -Wno-format -c -o ld-address.o >> glibc/locale/programs/ld-address.c >> | In file included from glibc/locale/programs/localedef.h:24, >> | from glibc/locale/programs/ld-address.c:30: >> | ./include/locale.h:6: error: conflicting types for 'locale_t' >> | glibc/locale/xlocale.h:42: error: previous declaration of 'locale_t' was >> here >> | make: *** [ld-address.o] Error 1 >> | ERROR: oe_runmake failed >> >> Signed-off-by: Matthew McClintock <m...@freescale.com> >> --- >> meta/recipes-core/eglibc/cross-localedef-native_2.16.bb | 9 +++++++-- >> .../eglibc/eglibc-2.16/fix_for_centos_5.8.patch | 13 >> +++++++++++++ >> 2 files changed, 20 insertions(+), 2 deletions(-) >> create mode 100644 >> meta/recipes-core/eglibc/eglibc-2.16/fix_for_centos_5.8.patch >> >> diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb >> b/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb >> index 47f0834..a79a276 100644 >> --- a/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb >> +++ b/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb >> @@ -13,10 +13,15 @@ LIC_FILES_CHKSUM = >> "file://${LIC_DIR}/LICENSES;md5=98a1128c4b58120182cbea3b1752d >> inherit native >> inherit autotools >> >> -PR = "r0" >> +# pick up an eglibc-2.16 patch >> +FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}" >> + >> +PR = "r1" >> SRCREV="19383" >> EGLIBC_BRANCH="eglibc-2_16" >> -SRC_URI = >> "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http " >> +SRC_URI = >> "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \ >> + file://fix_for_centos_5.8.patch;patchdir=.. \ >> + " >> S = "${WORKDIR}/${EGLIBC_BRANCH}/localedef" >> >> do_unpack_append() { >> diff --git a/meta/recipes-core/eglibc/eglibc-2.16/fix_for_centos_5.8.patch >> b/meta/recipes-core/eglibc/eglibc-2.16/fix_for_centos_5.8.patch >> new file mode 100644 >> index 0000000..32ee16d >> --- /dev/null >> +++ b/meta/recipes-core/eglibc/eglibc-2.16/fix_for_centos_5.8.patch >> @@ -0,0 +1,13 @@ >> +Index: eglibc-2_16/libc/locale/programs/config.h > > No patch header here...
Overlooked late last night, v2 sent. -M > > Cheers, > > Richard > > >> +=================================================================== >> +--- eglibc-2_16.orig/libc/locale/programs/config.h >> ++++ eglibc-2_16/libc/locale/programs/config.h >> +@@ -19,6 +19,8 @@ >> + #ifndef _LD_CONFIG_H >> + #define _LD_CONFIG_H 1 >> + >> ++#define DUMMY_LOCALE_T >> ++ >> + /* Use the internal textdomain used for libc messages. */ >> + #define PACKAGE _libc_intl_domainname >> + #ifndef VERSION > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core