summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/eglibc
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2012-08-17 12:54:07 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-19 10:45:59 +0100
commitd2737ebd7f9882eb237aff42e24490686d77c68f (patch)
treeb6b306b106b8486214bc1d6fd4ea53cc955ea352 /meta/recipes-core/eglibc
parent9e36b4f21b5b73dc75382258102cc1575886c88d (diff)
downloadpoky-d2737ebd7f9882eb237aff42e24490686d77c68f.tar.gz
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>
Diffstat (limited to 'meta/recipes-core/eglibc')
-rw-r--r--meta/recipes-core/eglibc/cross-localedef-native_2.16.bb9
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.16/fix_for_centos_5.8.patch18
2 files changed, 25 insertions, 2 deletions
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 47f0834003..a79a276ae4 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
13inherit native 13inherit native
14inherit autotools 14inherit autotools
15 15
16PR = "r0" 16# pick up an eglibc-2.16 patch
17FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}"
18
19PR = "r1"
17SRCREV="19383" 20SRCREV="19383"
18EGLIBC_BRANCH="eglibc-2_16" 21EGLIBC_BRANCH="eglibc-2_16"
19SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http " 22SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};protocol=http \
23 file://fix_for_centos_5.8.patch;patchdir=.. \
24 "
20S = "${WORKDIR}/${EGLIBC_BRANCH}/localedef" 25S = "${WORKDIR}/${EGLIBC_BRANCH}/localedef"
21 26
22do_unpack_append() { 27do_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 0000000000..7618c99534
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.16/fix_for_centos_5.8.patch
@@ -0,0 +1,18 @@
1Upstream-Status: Inappropriate [other]
2
3This is a hack to fix building the locale bits on an older
4CentOs 5.X machine
5
6Index: eglibc-2_16/libc/locale/programs/config.h
7===================================================================
8--- eglibc-2_16.orig/libc/locale/programs/config.h
9+++ eglibc-2_16/libc/locale/programs/config.h
10@@ -19,6 +19,8 @@
11 #ifndef _LD_CONFIG_H
12 #define _LD_CONFIG_H 1
13
14+#define DUMMY_LOCALE_T
15+
16 /* Use the internal textdomain used for libc messages. */
17 #define PACKAGE _libc_intl_domainname
18 #ifndef VERSION