From: Holger Freyther Date: Mon, 14 Feb 2005 17:21:41 +0000 (+0000) Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded X-Git-Tag: Release-2010-05/1~15019 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be81903055a852896d406734248583a01c03aa2f;p=openembedded.git Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/ich/programming/oe/openembedded 2005/02/14 18:20:30+01:00 handhelds.org!zecke glibc 2.3.2+cvs2004726: Depend both glibc and glibc-intermediate on linux-libc-headers. This fixes the creation of a toolchain for me 2005/02/14 14:39:04+01:00 handhelds.org!zecke Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/ich/programming/oe/openembedded BKrev: 4210de25wMoqU9r6y0dLMY_UE-6Vnw --- diff --git a/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb b/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb index d95400cf39..9290b1d5d7 100644 --- a/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb @@ -7,6 +7,6 @@ do_install () { PACKAGES = "" PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc" -DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial" +DEPENDS += " virtual/${TARGET_PREFIX}gcc-initial " GLIBC_ADDONS = "linuxthreads" GLIBC_EXTRA_OECONF = "" diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index 3e62db32b2..29047ea15a 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -4,9 +4,10 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" MAINTAINER = "Phil Blundell " +DEPENDS = "linux-libc-headers" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r14" +PR = "r15" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/nonworking/kde/arts-native_1.2.2.bb b/packages/kde/arts_1.2.2.bb similarity index 100% rename from packages/nonworking/kde/arts-native_1.2.2.bb rename to packages/kde/arts_1.2.2.bb