From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Cc: Matthew McClintock <msm@freescale.com>,
openembedded-core@openembedded.org
Subject: Re: [PATCH] cross-localedef-native_2.16.bb: fix for CentOS 5.X
Date: Fri, 17 Aug 2012 13:10:54 +0100 [thread overview]
Message-ID: <1345205454.27428.3.camel@ted> (raw)
In-Reply-To: <1345158769-15782-1-git-send-email-msm@freescale.com>
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 <msm@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...
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
next prev parent reply other threads:[~2012-08-17 12:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-16 23:12 [PATCH] cross-localedef-native_2.16.bb: fix for CentOS 5.X Matthew McClintock
2012-08-17 12:10 ` Richard Purdie [this message]
2012-08-17 17:54 ` McClintock Matthew-B29882
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345205454.27428.3.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=msm@freescale.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=openembedded-core@openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.