summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glibc
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-08-05 19:38:06 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-02 09:52:31 +0100
commit561d875404ef1783f94f37314b6e756766db8411 (patch)
tree664f8afe01c9ba8828ab02b19367e97e52dae842 /meta/recipes-core/glibc
parent436d590c4a5b7b5942bac5b51af128bcdd30621f (diff)
downloadpoky-561d875404ef1783f94f37314b6e756766db8411.tar.gz
libc-package.bbclass: merge glibc & eglibc class files
Other enhancements: print qemu's stdio & error on failure glibc: enable locale generation for all arches eglibc: enable binary locale generation for mips And cleanup of code based on the code review. [e]glibc: move common definition in the common file bitbake was complaining about duplicate definition of get_libc_fpu_setting in eglibc.inc & glibc.inc files. And bump PRs Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/glibc')
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc79
-rw-r--r--meta/recipes-core/glibc/glibc_2.10.1.bb4
2 files changed, 47 insertions, 36 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 858bc522b5..5c683bbe7d 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -24,42 +24,54 @@ python __anonymous () {
24ENABLE_BINARY_LOCALE_GENERATION ?= "0" 24ENABLE_BINARY_LOCALE_GENERATION ?= "0"
25 25
26# BINARY_LOCALE_ARCHES is a space separated list of regular expressions 26# BINARY_LOCALE_ARCHES is a space separated list of regular expressions
27BINARY_LOCALE_ARCHES ?= "arm.*" 27BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
28
29PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
30PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*"
31
32libc_baselibs = "${base_libdir}/libc* ${base_libdir}/libm* ${base_libdir}/ld* ${base_libdir}/libpthread* ${base_libdir}/libresolv* ${base_libdir}/librt* ${base_libdir}/libutil* ${base_libdir}/libnsl* ${base_libdir}/libnss_files* ${base_libdir}/libnss_compat* ${base_libdir}/libnss_dns* ${base_libdir}/libdl* ${base_libdir}/libanl* ${base_libdir}/libBrokenLocale*"
33
34# The problem is that if PN = "glibc", FILES_${PN} will overwrite FILES_glibc
35# Solution: Make them both the same thing, then it doesn't matter
36
37glibcfiles = "${sysconfdir} ${libc_baselibs} ${base_sbindir}/ldconfig ${libexecdir}/* ${datadir}/zoneinfo"
38glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \
39 ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \
40 ${libdir}/gconv/.debug ${libexecdir}/*/.debug"
41glibcdevfiles = "${bindir}/rpcgen ${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
42 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
43 ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
44
45FILES_glibc = "${glibcfiles}"
46FILES_${PN} = "${glibcfiles}"
47FILES_ldd = "${bindir}/ldd"
48FILES_libsegfault = "${base_libdir}/libSegFault*"
49FILES_glibc-extra-nss = "${base_libdir}/libnss*"
50FILES_sln = "${base_sbindir}/sln"
51FILES_glibc-dev = "${glibcdevfiles}"
52FILES_${PN}-dev = "${glibcdevfiles}"
53FILES_glibc-dbg = "${glibcdbgfiles}"
54FILES_${PN}-dbg = "${glibcdbgfiles}"
55FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*"
56FILES_glibc-utils = "${bindir}/* ${sbindir}/*"
57FILES_glibc-gconv = "${libdir}/gconv/*"
58FILES_catchsegv = "${bindir}/catchsegv"
59RDEPENDS_catchsegv = "libsegfault"
60FILES_glibc-pcprofile = "${base_libdir}/libpcprofile.so"
61FILES_glibc-thread-db = "${base_libdir}/libthread_db*"
62FILES_localedef = "${bindir}/localedef"
63RPROVIDES_glibc-dev += "libc-dev"
64
65DESCRIPTION_sln = "glibc: create symbolic links between files"
66DESCRIPTION_nscd = "glibc: name service cache daemon for passwd, group, and hosts"
67DESCRIPTION_glibc-extra-nss = "glibc: nis, nisplus and hesiod search services"
68DESCRIPTION_ldd = "glibc: print shared library dependencies"
69DESCRIPTION_localedef = "glibc: compile locale definition files"
70DESCRIPTION_glibc-utils = "glibc: misc utilities like iconf, local, gencat, tzselect, rpcinfo, ..."
28 71
29 72
30inherit glibc-package
31
32def get_glibc_fpu_setting(bb, d):
33 if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
34 return "--without-fp"
35 return ""
36
37EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
38EXTRA_OEMAKE += "rootsbindir=${base_sbindir}" 73EXTRA_OEMAKE += "rootsbindir=${base_sbindir}"
39 74
40OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}"
41
42do_install() {
43 oe_runmake install_root=${D} install
44 for r in ${rpcsvc}; do
45 h=`echo $r|sed -e's,\.x$,.h,'`
46 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
47 done
48 install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/
49 install -d ${D}${libdir}/locale
50 make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
51 # get rid of some broken files...
52 for i in ${GLIBC_BROKEN_LOCALES}; do
53 grep -v $i ${WORKDIR}/SUPPORTED > ${WORKDIR}/SUPPORTED.tmp
54 mv ${WORKDIR}/SUPPORTED.tmp ${WORKDIR}/SUPPORTED
55 done
56 rm -f ${D}{sysconfdir}/rpc
57 rm -f ${D}${includedir}/scsi/sg.h
58 rm -f ${D}${includedir}/scsi/scsi_ioctl.h
59 rm -f ${D}${includedir}/scsi/scsi.h
60}
61
62
63python __anonymous () { 75python __anonymous () {
64 enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1) 76 enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1)
65 77
@@ -80,5 +92,4 @@ python __anonymous () {
80 break 92 break
81} 93}
82 94
83 95inherit libc-package
84
diff --git a/meta/recipes-core/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb
index 2a118a4af6..a82a870256 100644
--- a/meta/recipes-core/glibc/glibc_2.10.1.bb
+++ b/meta/recipes-core/glibc/glibc_2.10.1.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
5PACKAGES_DYNAMIC = "libc6*" 5PACKAGES_DYNAMIC = "libc6*"
6RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" 6RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
7 7
8PR = "r0" 8PR = "r2"
9 9
10# the -isystem in bitbake.conf screws up glibc do_stage 10# the -isystem in bitbake.conf screws up glibc do_stage
11BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" 11BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
@@ -85,7 +85,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
85 --without-selinux \ 85 --without-selinux \
86 ${GLIBC_EXTRA_OECONF}" 86 ${GLIBC_EXTRA_OECONF}"
87 87
88EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" 88EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
89 89
90do_munge() { 90do_munge() {
91 # Integrate ports and libidn into tree 91 # Integrate ports and libidn into tree