sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

cross-localedef-native_2.16.bb: fix for CentOS 5.X 

| 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

(From OE-Core rev: 48a698bf97a47a346d5b7d79c2709301e98b4c2c)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Matthew McClintock 2012-08-17 12:54:07 -05:00 committed by Richard Purdie
parent 9e36b4f21b
commit d2737ebd7f
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/recipes-core/eglibc/cross-localedef-native_2.16.bb
View File

@ -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() {

18
meta/recipes-core/eglibc/eglibc-2.16/fix_for_centos_5.8.patch Normal file
View File

@ -0,0 +1,18 @@
Upstream-Status: Inappropriate [other]
This is a hack to fix building the locale bits on an older
CentOs 5.X machine
Index: eglibc-2_16/libc/locale/programs/config.h
===================================================================
--- 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