From c62f986081d0180089542b13eb327c6e3b75c658 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 28 Aug 2014 06:13:57 +0000 Subject: [PATCH] recipes: Remove references to eglibc change use of eglibc related variabled to glibc equivalents (From OE-Core rev: fd15d6e0c8da75951a91d4467eda23c229b1026d) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib.inc | 22 +++++++++++----------- meta/recipes-core/libxml/libxml2.inc | 2 +- .../packagegroups/packagegroup-self-hosted.bb | 6 +++--- meta/recipes-devtools/gcc/gcc-common.inc | 2 +- meta/recipes-devtools/valgrind/valgrind_3.9.0.bb | 2 +- meta/recipes-extended/lsof/lsof_4.87.bb | 4 ++-- .../packagegroups/packagegroup-core-lsb.bb | 18 +++++++++--------- .../texinfo-dummy-native/texinfo-dummy/template.py | 2 +- meta/recipes-qt/qt4/qt4.inc | 2 +- meta/recipes-support/libiconv/libiconv_1.11.1.bb | 4 ++-- meta/recipes-support/libiconv/libiconv_1.14.bb | 4 ++-- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index bd8d74b..2d81afc 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -86,17 +86,17 @@ RDEPENDS_${PN}-ptest += "\ " RDEPENDS_${PN}-ptest_append_libc-glibc = "\ - eglibc-gconv-utf-16 \ - eglibc-charmap-utf-8 \ - eglibc-gconv-cp1255 \ - eglibc-charmap-cp1255 \ - eglibc-gconv-utf-32 \ - eglibc-gconv-utf-7 \ - eglibc-gconv-euc-jp \ - eglibc-gconv-iso8859-1 \ - eglibc-gconv-iso8859-15 \ - eglibc-charmap-invariant \ - eglibc-localedata-translit-cjk-variants \ + glibc-gconv-utf-16 \ + glibc-charmap-utf-8 \ + glibc-gconv-cp1255 \ + glibc-charmap-cp1255 \ + glibc-gconv-utf-32 \ + glibc-gconv-utf-7 \ + glibc-gconv-euc-jp \ + glibc-gconv-iso8859-1 \ + glibc-gconv-iso8859-15 \ + glibc-charmap-invariant \ + glibc-localedata-translit-cjk-variants \ " INSANE_SKIP_${PN}-ptest += "libdir" diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc index 92a25dc..bcf9a62 100644 --- a/meta/recipes-core/libxml/libxml2.inc +++ b/meta/recipes-core/libxml/libxml2.inc @@ -29,7 +29,7 @@ inherit autotools pkgconfig binconfig-disabled pythonnative ptest RDEPENDS_${PN}-ptest += "python-core" -RDEPENDS_${PN}-ptest_append_libc-glibc += "eglibc-gconv-ebcdic-us eglibc-gconv-ibm1141" +RDEPENDS_${PN}-ptest_append_libc-glibc += "glibc-gconv-ebcdic-us glibc-gconv-ibm1141" # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header do_configure_prepend () { diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index 8e3b917..f495134 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -64,7 +64,7 @@ RRECOMMENDS_packagegroup-self-hosted-host-tools = "\ kernel-module-iptable-filter \ " -# eglibc-utils: for rpcgen +# glibc-utils: for rpcgen RDEPENDS_packagegroup-self-hosted-sdk = "\ autoconf \ automake \ @@ -75,8 +75,8 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\ cpp \ cpp-symlinks \ distcc \ - eglibc-utils \ - eglibc-gconv-ibm850 \ + glibc-utils \ + glibc-gconv-ibm850 \ file \ findutils \ g++ \ diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 497d06a..b50cc1d 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -26,7 +26,7 @@ def get_gcc_mips_plt_setting(bb, d): return "" def get_long_double_setting(bb, d): - if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC', True) in [ 'uclibc', 'eglibc' ]: + if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC', True) in [ 'uclibc', 'glibc' ]: return "--with-long-double-128" return "" diff --git a/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb index 3c6aa13..3e8c4ce 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb @@ -48,7 +48,7 @@ FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug/*" # redirect functions like strlen. RRECOMMENDS_${PN} += "${TCLIBC}-dbg" -RDEPENDS_${PN}-ptest += " sed perl eglibc-utils" +RDEPENDS_${PN}-ptest += " sed perl glibc-utils" do_compile_ptest() { oe_runmake check diff --git a/meta/recipes-extended/lsof/lsof_4.87.bb b/meta/recipes-extended/lsof/lsof_4.87.bb index 5676cd9..e7a1eb2 100644 --- a/meta/recipes-extended/lsof/lsof_4.87.bb +++ b/meta/recipes-extended/lsof/lsof_4.87.bb @@ -30,8 +30,8 @@ export LSOF_INCLUDE = "${STAGING_INCDIR}" do_configure () { export LSOF_AR="${AR} cr" export LSOF_RANLIB="${RANLIB}" - if [ "x${EGLIBCVERSION}" != "x" ];then - LINUX_CLIB=`echo ${EGLIBCVERSION} |sed -e 's,\.,,g'` + if [ "x${GLIBCVERSION}" != "x" ];then + LINUX_CLIB=`echo ${GLIBCVERSION} |sed -e 's,\.,,g'` LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}" export LINUX_CLIB fi diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 30b6e15..dd96fbe 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb @@ -128,7 +128,7 @@ RDEPENDS_packagegroup-core-lsb-core = "\ cups \ diffutils \ ed \ - eglibc-utils \ + glibc-utils \ elfutils \ file \ findutils \ @@ -158,7 +158,7 @@ RDEPENDS_packagegroup-core-lsb-core = "\ util-linux \ xdg-utils \ \ - eglibc \ + glibc \ libgcc \ libpam \ libxml2 \ @@ -245,13 +245,13 @@ RDEPENDS_packagegroup-core-lsb-runtime-add = "\ libxml-parser-perl \ libxml-perl \ libxml-sax-perl \ - eglibc-localedatas \ - eglibc-gconvs \ - eglibc-charmaps \ - eglibc-binaries \ - eglibc-localedata-posix \ - eglibc-extra-nss \ - eglibc-pcprofile \ + glibc-localedatas \ + glibc-gconvs \ + glibc-charmaps \ + glibc-binaries \ + glibc-localedata-posix \ + glibc-extra-nss \ + glibc-pcprofile \ libclass-isa-perl \ libenv-perl \ libdumpvalue-perl \ diff --git a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py index b0ebf75..8b7033e 100644 --- a/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py +++ b/meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py @@ -44,7 +44,7 @@ with details on the recipe that failed. """ % this_binary # Autotools setups query the version, so this is actually necessary. Some of -# them (lookin' at you, eglibc) actually look for the substring "GNU texinfo," +# them (lookin' at you, glibc) actually look for the substring "GNU texinfo," # so we put that substring in there without actually telling a lie. version_str = """ %s (fake texinfo, emulating GNU texinfo) 5.2 diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 75a580c..09f6d93 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -134,7 +134,7 @@ FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/${QT_DIR_NAME}/qch/qt.qch" RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}" RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}" RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}" -RRECOMMENDS_${QT_BASE_LIB}core4_append_libc-glibc = " eglibc-gconv-utf-16" +RRECOMMENDS_${QT_BASE_LIB}core4_append_libc-glibc = " glibc-gconv-utf-16" RRECOMMENDS_${QT_BASE_NAME}-demos += " \ ${QT_BASE_NAME}-examples \ ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ diff --git a/meta/recipes-support/libiconv/libiconv_1.11.1.bb b/meta/recipes-support/libiconv/libiconv_1.11.1.bb index c52564a..abf739b 100644 --- a/meta/recipes-support/libiconv/libiconv_1.11.1.bb +++ b/meta/recipes-support/libiconv/libiconv_1.11.1.bb @@ -21,8 +21,8 @@ S = "${WORKDIR}/libiconv-${PV}" inherit autotools pkgconfig gettext python __anonymous() { - if d.getVar("TCLIBC", True) == "eglibc": - raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - eglibc already provides iconv") + if d.getVar("TCLIBC", True) == "glibc": + raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") } EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" diff --git a/meta/recipes-support/libiconv/libiconv_1.14.bb b/meta/recipes-support/libiconv/libiconv_1.14.bb index d5f47b4..1b6fe09 100644 --- a/meta/recipes-support/libiconv/libiconv_1.14.bb +++ b/meta/recipes-support/libiconv/libiconv_1.14.bb @@ -25,8 +25,8 @@ inherit autotools pkgconfig gettext python __anonymous() { if d.getVar("TARGET_OS", True) != "linux": return - if d.getVar("TCLIBC", True) == "eglibc": - raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - eglibc already provides iconv") + if d.getVar("TCLIBC", True) == "glibc": + raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv") } EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" -- 2.7.4