From: Chris Larson <clarson@kergoth.com>
Date: Wed, 10 Sep 2003 05:24:53 +0000 (+0000)
Subject: qte-2.3.6.oe:
X-Git-Tag: Release-2010-05/1~20875
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2398172cfb40ad7e62aaf26d89fcd134f0df1d6e;p=openembedded.git

qte-2.3.6.oe:
  BUGFIX: qte depends
glibc-2.3.2.oe:
  BUGFIX: libc.so wasnt being handled well.

BKrev: 3f5eb5a5kHE_DaIAUtL0g-UZmaSacA
---

diff --git a/content/glibc-2.3.2.oe b/content/glibc-2.3.2.oe
index 466347bcf0..c8bee6020e 100644
--- a/content/glibc-2.3.2.oe
+++ b/content/glibc-2.3.2.oe
@@ -92,11 +92,11 @@ do_stage() {
 	oe_runmake -C ${builddir} install_root=${STAGING_DIR}/target \
 		includedir=/include libdir=/lib slibdir=/lib \
 		${STAGING_LIBDIR}/libc-${PV}.so ${STAGING_LIBDIR}/libc.so.6 \
-		${STAGING_LIBDIR}/libc.so install-headers install-lib
-	for i in pthread c; do
-		mv ${STAGING_LIBDIR}/lib$i.so ${STAGING_LIBDIR}/lib$i-old.so
-		cat ${STAGING_LIBDIR}/lib$i-old.so | sed -e's,/lib/,,g' > ${STAGING_LIBDIR}/lib$i.so
-	done
+		install-headers install-lib
+	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > \
+		${STAGING_LIBDIR}/libc.so
+	mv ${STAGING_LIBDIR}/libpthread.so ${STAGING_LIBDIR}/libpthread-old.so
+	cat ${STAGING_LIBDIR}/libpthread-old.so | sed -e's,/lib/,,g' > ${STAGING_LIBDIR}/libpthread.so
 }
 
 do_install() {
diff --git a/content/qte-2.3.6.oe b/content/qte-2.3.6.oe
index 6354716c1a..b672af351b 100644
--- a/content/qte-2.3.6.oe
+++ b/content/qte-2.3.6.oe
@@ -2,7 +2,7 @@ DESCRIPTION="Qt/Embedded version 2.3.6"
 LICENSE="GPL/QPL"
 SRC_URI="ftp://ftp.trolltech.com/pub/qtopia/source/qt-embedded-2.3.6.tar.gz"
 SRC_URI_append=" file://${FILESDIR}/qpe.patch;patch=1"
-DEPENDS=virtual/libc base/zlib content/libpng content/libjpeg
+DEPENDS=virtual/libc zlib libpng libjpeg
 PROVIDES=virtual/qte virtual/libqte2
 S="${WORKDIR}/qt-${PV}"