diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-04-30 23:02:48 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-04-30 23:02:48 +0000 |
| commit | 10aaf81c685996ed198a599545996838cfac85aa (patch) | |
| tree | cbbc3ff5d5505299befe35daa2a2ef2eb839b2d1 /glibc/glibc_cvs.oe | |
| parent | 5da73e161be7ef9f7713a974eb1f8d8e4c25eb5f (diff) | |
if nptl is enabled, depend on full gcc rather than -initial - patch courtesy pb_.
BKrev: 4092db18Pl_xkMu2rcL6WFprKxy2dA
Diffstat (limited to 'glibc/glibc_cvs.oe')
| -rw-r--r-- | glibc/glibc_cvs.oe | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/glibc/glibc_cvs.oe b/glibc/glibc_cvs.oe index ee91fd2674..a64d35bf48 100644 --- a/glibc/glibc_cvs.oe +++ b/glibc/glibc_cvs.oe @@ -6,6 +6,9 @@ SECTION = "libs" PRIORITY = "required" MAINTAINER = "Phil Blundell <pb@handhelds.org>" +LIBC_ADDONS ?= "linuxthreads" +LIBC_EXTRA_OECONF ?= "" + # # For now, we will skip building of a gcc package if it is a uclibc one # and our build is not a uclibc one, and we skip a glibc one if our build @@ -22,10 +25,11 @@ python __anonymous () { oe.data.getVar('TARGET_OS', d, 1)) } -PROVIDES = "virtual/libc" PACKAGES = "glibc glibc-dev glibc-doc glibc-i18n glibc-locale" -DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial" +# nptl needs unwind support in gcc, which can't be built without glibc. +PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${LIBC_ADDONS}']}" +DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${LIBC_ADDONS}']}" FILES_glibc_append = " ${datadir}/zoneinfo" FILES_glibc-dev_append = " ${libdir}/*.o" @@ -51,9 +55,6 @@ B = "${WORKDIR}/build-${TARGET_SYS}" inherit autotools -LIBC_ADDONS ?= "linuxthreads" -LIBC_EXTRA_OECONF ?= "" - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ |