summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc22
-rw-r--r--meta/recipes-core/libxml/libxml2.inc2
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-self-hosted.bb6
-rw-r--r--meta/recipes-devtools/gcc/gcc-common.inc2
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.9.0.bb2
-rw-r--r--meta/recipes-extended/lsof/lsof_4.87.bb4
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb18
-rw-r--r--meta/recipes-extended/texinfo-dummy-native/texinfo-dummy/template.py2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc2
-rw-r--r--meta/recipes-support/libiconv/libiconv_1.11.1.bb4
-rw-r--r--meta/recipes-support/libiconv/libiconv_1.14.bb4
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 bd8d74b3aa..2d81afc8f2 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 += "\
86 " 86 "
87 87
88RDEPENDS_${PN}-ptest_append_libc-glibc = "\ 88RDEPENDS_${PN}-ptest_append_libc-glibc = "\
89 eglibc-gconv-utf-16 \ 89 glibc-gconv-utf-16 \
90 eglibc-charmap-utf-8 \ 90 glibc-charmap-utf-8 \
91 eglibc-gconv-cp1255 \ 91 glibc-gconv-cp1255 \
92 eglibc-charmap-cp1255 \ 92 glibc-charmap-cp1255 \
93 eglibc-gconv-utf-32 \ 93 glibc-gconv-utf-32 \
94 eglibc-gconv-utf-7 \ 94 glibc-gconv-utf-7 \
95 eglibc-gconv-euc-jp \ 95 glibc-gconv-euc-jp \
96 eglibc-gconv-iso8859-1 \ 96 glibc-gconv-iso8859-1 \
97 eglibc-gconv-iso8859-15 \ 97 glibc-gconv-iso8859-15 \
98 eglibc-charmap-invariant \ 98 glibc-charmap-invariant \
99 eglibc-localedata-translit-cjk-variants \ 99 glibc-localedata-translit-cjk-variants \
100 " 100 "
101 101
102INSANE_SKIP_${PN}-ptest += "libdir" 102INSANE_SKIP_${PN}-ptest += "libdir"
diff --git a/meta/recipes-core/libxml/libxml2.inc b/meta/recipes-core/libxml/libxml2.inc
index 92a25dcc2b..bcf9a62ded 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
29 29
30RDEPENDS_${PN}-ptest += "python-core" 30RDEPENDS_${PN}-ptest += "python-core"
31 31
32RDEPENDS_${PN}-ptest_append_libc-glibc += "eglibc-gconv-ebcdic-us eglibc-gconv-ibm1141" 32RDEPENDS_${PN}-ptest_append_libc-glibc += "glibc-gconv-ebcdic-us glibc-gconv-ibm1141"
33 33
34# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header 34# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
35do_configure_prepend () { 35do_configure_prepend () {
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 8e3b917c75..f495134136 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 = "\
64 kernel-module-iptable-filter \ 64 kernel-module-iptable-filter \
65 " 65 "
66 66
67# eglibc-utils: for rpcgen 67# glibc-utils: for rpcgen
68RDEPENDS_packagegroup-self-hosted-sdk = "\ 68RDEPENDS_packagegroup-self-hosted-sdk = "\
69 autoconf \ 69 autoconf \
70 automake \ 70 automake \
@@ -75,8 +75,8 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\
75 cpp \ 75 cpp \
76 cpp-symlinks \ 76 cpp-symlinks \
77 distcc \ 77 distcc \
78 eglibc-utils \ 78 glibc-utils \
79 eglibc-gconv-ibm850 \ 79 glibc-gconv-ibm850 \
80 file \ 80 file \
81 findutils \ 81 findutils \
82 g++ \ 82 g++ \
diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc
index 497d06ae8b..b50cc1d06a 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):
26 return "" 26 return ""
27 27
28def get_long_double_setting(bb, d): 28def get_long_double_setting(bb, d):
29 if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC', True) in [ 'uclibc', 'eglibc' ]: 29 if d.getVar('TRANSLATED_TARGET_ARCH', True) in [ 'powerpc', 'powerpc64' ] and d.getVar('TCLIBC', True) in [ 'uclibc', 'glibc' ]:
30 return "--with-long-double-128" 30 return "--with-long-double-128"
31 return "" 31 return ""
32 32
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb
index 3c6aa13364..3e8c4ce3d1 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/*"
48# redirect functions like strlen. 48# redirect functions like strlen.
49RRECOMMENDS_${PN} += "${TCLIBC}-dbg" 49RRECOMMENDS_${PN} += "${TCLIBC}-dbg"
50 50
51RDEPENDS_${PN}-ptest += " sed perl eglibc-utils" 51RDEPENDS_${PN}-ptest += " sed perl glibc-utils"
52 52
53do_compile_ptest() { 53do_compile_ptest() {
54 oe_runmake check 54 oe_runmake check
diff --git a/meta/recipes-extended/lsof/lsof_4.87.bb b/meta/recipes-extended/lsof/lsof_4.87.bb
index 5676cd9822..e7a1eb2129 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}"
30do_configure () { 30do_configure () {
31 export LSOF_AR="${AR} cr" 31 export LSOF_AR="${AR} cr"
32 export LSOF_RANLIB="${RANLIB}" 32 export LSOF_RANLIB="${RANLIB}"
33 if [ "x${EGLIBCVERSION}" != "x" ];then 33 if [ "x${GLIBCVERSION}" != "x" ];then
34 LINUX_CLIB=`echo ${EGLIBCVERSION} |sed -e 's,\.,,g'` 34 LINUX_CLIB=`echo ${GLIBCVERSION} |sed -e 's,\.,,g'`
35 LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}" 35 LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}"
36 export LINUX_CLIB 36 export LINUX_CLIB
37 fi 37 fi
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 30b6e1545f..dd96fbebaa 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 = "\
128 cups \ 128 cups \
129 diffutils \ 129 diffutils \
130 ed \ 130 ed \
131 eglibc-utils \ 131 glibc-utils \
132 elfutils \ 132 elfutils \
133 file \ 133 file \
134 findutils \ 134 findutils \
@@ -158,7 +158,7 @@ RDEPENDS_packagegroup-core-lsb-core = "\
158 util-linux \ 158 util-linux \
159 xdg-utils \ 159 xdg-utils \
160 \ 160 \
161 eglibc \ 161 glibc \
162 libgcc \ 162 libgcc \
163 libpam \ 163 libpam \
164 libxml2 \ 164 libxml2 \
@@ -245,13 +245,13 @@ RDEPENDS_packagegroup-core-lsb-runtime-add = "\
245 libxml-parser-perl \ 245 libxml-parser-perl \
246 libxml-perl \ 246 libxml-perl \
247 libxml-sax-perl \ 247 libxml-sax-perl \
248 eglibc-localedatas \ 248 glibc-localedatas \
249 eglibc-gconvs \ 249 glibc-gconvs \
250 eglibc-charmaps \ 250 glibc-charmaps \
251 eglibc-binaries \ 251 glibc-binaries \
252 eglibc-localedata-posix \ 252 glibc-localedata-posix \
253 eglibc-extra-nss \ 253 glibc-extra-nss \
254 eglibc-pcprofile \ 254 glibc-pcprofile \
255 libclass-isa-perl \ 255 libclass-isa-perl \
256 libenv-perl \ 256 libenv-perl \
257 libdumpvalue-perl \ 257 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 b0ebf75a15..8b7033eccc 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.
44""" % this_binary 44""" % this_binary
45 45
46# Autotools setups query the version, so this is actually necessary. Some of 46# Autotools setups query the version, so this is actually necessary. Some of
47# them (lookin' at you, eglibc) actually look for the substring "GNU texinfo," 47# them (lookin' at you, glibc) actually look for the substring "GNU texinfo,"
48# so we put that substring in there without actually telling a lie. 48# so we put that substring in there without actually telling a lie.
49version_str = """ %s (fake texinfo, emulating GNU texinfo) 5.2 49version_str = """ %s (fake texinfo, emulating GNU texinfo) 5.2
50 50
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 75a580c25f..09f6d93757 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"
134RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}" 134RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
135RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}" 135RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
136RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}" 136RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
137RRECOMMENDS_${QT_BASE_LIB}core4_append_libc-glibc = " eglibc-gconv-utf-16" 137RRECOMMENDS_${QT_BASE_LIB}core4_append_libc-glibc = " glibc-gconv-utf-16"
138RRECOMMENDS_${QT_BASE_NAME}-demos += " \ 138RRECOMMENDS_${QT_BASE_NAME}-demos += " \
139 ${QT_BASE_NAME}-examples \ 139 ${QT_BASE_NAME}-examples \
140 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ 140 ${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 c52564a42c..abf739bfa1 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}"
21inherit autotools pkgconfig gettext 21inherit autotools pkgconfig gettext
22 22
23python __anonymous() { 23python __anonymous() {
24 if d.getVar("TCLIBC", True) == "eglibc": 24 if d.getVar("TCLIBC", True) == "glibc":
25 raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - eglibc already provides iconv") 25 raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv")
26} 26}
27 27
28EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" 28EXTRA_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 d5f47b4e34..1b6fe09bb7 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
25python __anonymous() { 25python __anonymous() {
26 if d.getVar("TARGET_OS", True) != "linux": 26 if d.getVar("TARGET_OS", True) != "linux":
27 return 27 return
28 if d.getVar("TCLIBC", True) == "eglibc": 28 if d.getVar("TCLIBC", True) == "glibc":
29 raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - eglibc already provides iconv") 29 raise bb.parse.SkipPackage("libiconv is provided for use with uClibc only - glibc already provides iconv")
30} 30}
31 31
32EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable" 32EXTRA_OECONF += "--enable-shared --enable-static --enable-relocatable"