summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-07-26 07:36:52 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-07-26 07:36:52 +0000
commit2fb69c3c0aa21da35060298c2ce875caba0004a0 (patch)
treed32eaf1b0a11d9b7557ab8d02f55388337a76a4f
parent31de720064930a076ef2c4521d03b3c066b3a5f9 (diff)
parent2fd1bd8160c4a93bb1811aedc2e9061b786ba745 (diff)
merge of '0308024e7a88007651ed3a14db106a00b69b32a1'
and '18c98c8c6d244da50f3f633a86903fd971aa0602'
-rw-r--r--conf/distro/include/sane-srcrevs.inc4
-rw-r--r--packages/eglibc/eglibc.inc5
-rw-r--r--packages/eglibc/eglibc_svn.bb2
3 files changed, 7 insertions, 4 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 4490907774..3840346eb9 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -26,8 +26,8 @@ SRCREV_pn-dfu-util-native ?= "4160"
SRCREV_pn-diversity-daemon ?= "277"
SRCREV_pn-diversity-nav ?= "340"
SRCREV_pn-eds-dbus ?= "659"
-SRCREV_pn-eglibc ?= "6229"
-SRCREV_pn-eglibc-initial ?= "6229"
+SRCREV_pn-eglibc ?= "6625"
+SRCREV_pn-eglibc-initial ?= "6625"
SRCREV_pn-enlazar ?= "37"
SRCREV_pn-exalt ?= "79"
SRCREV_pn-exalt-daemon ?= "78"
diff --git a/packages/eglibc/eglibc.inc b/packages/eglibc/eglibc.inc
index 5d531a7915..0309a7f1b2 100644
--- a/packages/eglibc/eglibc.inc
+++ b/packages/eglibc/eglibc.inc
@@ -11,7 +11,10 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc-intermediate linux-libc-headers"
#RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
PROVIDES += "virtual/libintl virtual/libiconv"
-
+# We need this RRECOMMENDS because libc dlopens libgcc
+# and shlib mechanism can not detect it because its not
+# listed in the NEEDED field.
+RRECOMMENDS += "libgcc"
inherit autotools
LEAD_SONAME = "libc.so"
diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb
index 1be10c13ad..3e8a5a0c99 100644
--- a/packages/eglibc/eglibc_svn.bb
+++ b/packages/eglibc/eglibc_svn.bb
@@ -3,7 +3,7 @@ require eglibc.inc
# DEFAULT_PREFERENCE = "-1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
PV = "2.8+svnr${SRCREV}"
-PR = "r7"
+PR = "r8"
SRC_URI = "svn://svn.eglibc.org;module=trunk \
file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
file://etc/ld.so.conf \