[oe-commits] org.oe.dev glibc: Various tweaks from Poky

[rpurdie commit]

glibc: Various tweaks from Poky

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 7da1c93d8e0d12a34bf02402dbef9cbbf84c1dd0
ViewMTN: http://monotone.openembedded.org/revision/info/7da1c93d8e0d12a34bf02402dbef9cbbf84c1dd0
Files:
1
packages/glibc/glibc-initial.inc
packages/glibc/glibc-package.bbclass
Diffs:

#
# mt diff -re34628e7e259929b32c2f303b17d82c0e541eb69 -r7da1c93d8e0d12a34bf02402dbef9cbbf84c1dd0
#
# 
# 
# patch "packages/glibc/glibc-initial.inc"
#  from [edf86eee3b82e6c856795cfdf29481c1119ea9eb]
#    to [62ca813faa060868029e9048fa2a224239e64044]
# 
# patch "packages/glibc/glibc-package.bbclass"
#  from [71e532d510413de3e18dd2b598fc5523ea29f7a9]
#    to [7424898eefe4cc4de00b0f2afd7c044a6c8fb18d]
# 
============================================================
--- packages/glibc/glibc-initial.inc	edf86eee3b82e6c856795cfdf29481c1119ea9eb
+++ packages/glibc/glibc-initial.inc	62ca813faa060868029e9048fa2a224239e64044
@@ -11,7 +11,7 @@ do_configure () {
 	chmod +x ${S}/configure
 	CC="${BUILD_CC}" CPP="${BUILD_CPP}" LD="${BUILD_LD}" ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
 		--without-cvs --disable-sanity-checks \
-		--with-headers=${CROSS_DIR}/${TARGET_SYS}/include \
+		--with-headers=${STAGING_DIR_TARGET}${layout_includedir} \
 		--enable-hacker-mode
 	if grep -q GLIBC_2.3 ${S}/ChangeLog; then
 		# glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, which fails without a real cross-compiler.
============================================================
--- packages/glibc/glibc-package.bbclass	71e532d510413de3e18dd2b598fc5523ea29f7a9
+++ packages/glibc/glibc-package.bbclass	7424898eefe4cc4de00b0f2afd7c044a6c8fb18d
@@ -27,7 +27,7 @@ PACKAGES = "glibc-dbg glibc catchsegv sl
 BINARY_LOCALE_ARCHES ?= "arm.*"
 
 PACKAGES = "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"
-PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-*"
+PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*"
 
 libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*"
 
@@ -40,7 +40,7 @@ FILES_glibc-gconv = "${libdir}/gconv/*"
 FILES_nscd = "${sbindir}/nscd*"
 FILES_glibc-utils = "${bindir}/* ${sbindir}/*"
 FILES_glibc-gconv = "${libdir}/gconv/*"
-FILES_${PN}-dbg += "${libexecdir}/getconf/.debug ${libdir}/gconv/.debug"
+FILES_${PN}-dbg += " ${libdir}/gconv/.debug ${libexecdir}/*/.debug"
 FILES_catchsegv = "${bindir}/catchsegv"
 RDEPENDS_catchsegv = "libsegfault"
 FILES_glibc-pcprofile = "/lib/libpcprofile.so"