From 5a0cc14110ecec406d29ff2d419b3764d1c9c222 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 23 Aug 2008 01:40:43 +0000 Subject: This adds a package name alias virtual-libc-dev for libc-dev(uclibc) and libc6-dev (glibc,eglibc) packages. This helps in using the common name for tasks which do not care about the libc being used. This also fixes Bug 4509 -Khem --- packages/eglibc/eglibc_svn.bb | 5 ++--- packages/glibc/glibc_2.5.bb | 4 ++-- packages/glibc/glibc_2.6.1.bb | 4 ++-- packages/glibc/glibc_2.7.bb | 4 ++-- packages/tasks/task-native-sdk.bb | 7 ++++--- packages/uclibc/bfin-uclibc_svn.bb | 2 +- packages/uclibc/uclibc.inc | 2 +- packages/uclibc/uclibc_0.9.26.bb | 2 +- packages/uclibc/uclibc_0.9.27.bb | 2 +- packages/uclibc/uclibc_0.9.28.bb | 2 +- packages/uclibc/uclibc_0.9.29.bb | 2 +- packages/uclibc/uclibc_nptl.bb | 2 +- packages/uclibc/uclibc_svn.bb | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb index a47e94ef2e..e23a13b5a2 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 = "r9" +PR = "r10" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ file://etc/ld.so.conf \ @@ -12,7 +12,7 @@ S = "${WORKDIR}/trunk/libc" B = "${WORKDIR}/build-${TARGET_SYS}" PACKAGES_DYNAMIC = "libc6*" -RPROVIDES_${PN}-dev = "libc6-dev" +RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" PROVIDES_${PN}-dbg = "glibc-dbg" # the -isystem in bitbake.conf screws up glibc do_stage @@ -39,7 +39,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index 701556d35a..a5908762ef 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -1,10 +1,10 @@ require glibc.inc -PR = "r16" +PR = "r17" ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" -RPROVIDES_${PN}-dev = "libc6-dev" +RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb index 6faa3df9af..6541dda197 100644 --- a/packages/glibc/glibc_2.6.1.bb +++ b/packages/glibc/glibc_2.6.1.bb @@ -1,8 +1,8 @@ require glibc.inc -PR = "r10" +PR = "r11" PACKAGES_DYNAMIC = "libc6*" -RPROVIDES_${PN}-dev = "libc6-dev" +RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb index 0e5a96234b..b6c329091c 100644 --- a/packages/glibc/glibc_2.7.bb +++ b/packages/glibc/glibc_2.7.bb @@ -3,9 +3,9 @@ require glibc.inc ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" -RPROVIDES_${PN}-dev = "libc6-dev" +RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" -PR = "r6" +PR = "r7" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --git a/packages/tasks/task-native-sdk.bb b/packages/tasks/task-native-sdk.bb index b840254176..61b6fc0279 100644 --- a/packages/tasks/task-native-sdk.bb +++ b/packages/tasks/task-native-sdk.bb @@ -1,10 +1,11 @@ DESCRIPTION = "Packages required for native (on-device) SDK" LICENSE = "MIT" -DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep" -RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \ +DEPENDS = "virtual/libc gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep" +RDEPENDS = "gcc-symlinks g++-symlinks cpp-symlinks binutils-symlinks \ + make virtual-libc-dev \ flex flex-dev bison gawk sed grep autoconf automake make \ patch patchutils diffstat diffutils libstdc++-dev" -PR = "r2" +PR = "r3" ALLOW_EMPTY = "1" PACKAGES = "${PN}" diff --git a/packages/uclibc/bfin-uclibc_svn.bb b/packages/uclibc/bfin-uclibc_svn.bb index cccb5d6527..4f83716e09 100644 --- a/packages/uclibc/bfin-uclibc_svn.bb +++ b/packages/uclibc/bfin-uclibc_svn.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r2" +PR = "r3" PV = "${UCLIBC_BASE}+svnr${SRCREV}" require uclibc.inc diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index 544d760e99..5b0ef914dd 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -52,7 +52,7 @@ FILES_uclibc-utils = "${bindir} ${sbindir}" FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug" FILES_uclibc-gconv = "${libdir}/gconv" FILES_uclibc-thread-db = "/lib/libthread_db*" -RPROVIDES_uclibc-dev += "libc-dev" +RPROVIDES_uclibc-dev += "libc-dev virtual-libc-dev" # # This locale file gets copied into uClibc-${PV}/extra/locale/ prior to diff --git a/packages/uclibc/uclibc_0.9.26.bb b/packages/uclibc/uclibc_0.9.26.bb index 1c52500ee6..a39e3479a2 100644 --- a/packages/uclibc/uclibc_0.9.26.bb +++ b/packages/uclibc/uclibc_0.9.26.bb @@ -1,4 +1,4 @@ -PR = "r10" +PR = "r11" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb index f730ad8a27..5236cb4d8a 100644 --- a/packages/uclibc/uclibc_0.9.27.bb +++ b/packages/uclibc/uclibc_0.9.27.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r10" +PR = "r11" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb index 1b2fc325d5..0aed389df3 100644 --- a/packages/uclibc/uclibc_0.9.28.bb +++ b/packages/uclibc/uclibc_0.9.28.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r14" +PR = "r15" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index 9c716b6237..f521490863 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r24" +PR = "r25" DEFAULT_PREFERENCE = "1" require uclibc.inc diff --git a/packages/uclibc/uclibc_nptl.bb b/packages/uclibc/uclibc_nptl.bb index 6d6fc361c6..b9b17224ec 100644 --- a/packages/uclibc/uclibc_nptl.bb +++ b/packages/uclibc/uclibc_nptl.bb @@ -8,7 +8,7 @@ # UCLIBC_BASE ?= "0.9.29" PV = "${UCLIBC_BASE}+svnr${SRCREV}" -PR = "r0" +PR = "r1" #DEFAULT_PREFERENCE = "2" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index 5dfa1b243c..7363d09b7c 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -8,7 +8,7 @@ # UCLIBC_BASE ?= "0.9.29" PV = "${UCLIBC_BASE}+svnr${SRCREV}" -PR = "r13" +PR = "r14" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. -- cgit v1.2.3