summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-05-13 12:56:48 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-13 12:56:48 +0000
commit2f58a7033eed8b93d55f28eb77e6564f4ce3cebe (patch)
tree85de572490526c180458fa5429fcad7502f00caa
parent58485078aba19b8731b94d5e3ab53f97f9c43399 (diff)
parent743d7e938e0e052bf169e30ab422bd4fc8acbe68 (diff)
merge of 1790fd843078a2ebd98288de3336054f298213fa
and 365caef70205e8aaef5c4715bb034a6e23ef0113
-rw-r--r--packages/glibc/glibc_2.3.5+cvs20050627.bb5
-rw-r--r--packages/tcltk/tk_8.4.11.bb4
2 files changed, 7 insertions, 2 deletions
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index d4220c80a6..61e3e84d6d 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -87,6 +87,11 @@ do_munge() {
# Integrate ports into tree
mv ${WORKDIR}/ports ${S}
+ # Need to copy some extra folder content for sh arch. - OE bug #954
+ case ${TARGET_ARCH} in
+ sh*) cp ${WORKDIR}/libc/sysdeps/sh/${TARGET_ARCH}/*.S ${WORKDIR}/libc/sysdeps/sh;;
+ esac
+
# http://www.handhelds.org/hypermail/oe/51/5135.html
# Some files were moved around between directories on
# 2005-12-21, which means that any attempt to check out
diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb
index b3d2733870..09b7c94320 100644
--- a/packages/tcltk/tk_8.4.11.bb
+++ b/packages/tcltk/tk_8.4.11.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Tool Command Language ToolKit Extension"
LICENSE = "tcl"
SECTION = "devel/tcltk"
HOMEPAGE = "http://tcl.sourceforge.net"
-DEPENDS = "tcl libx11"
+DEPENDS = "tcl libx11 libxt"
RDEPENDS = "tcl"
-PR = "r3"
+PR = "r4"
SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
file://disable-xim.patch;patch=1;pnum=0 \