diff options
| author | Gerald Britton <gbritton@doomcom.org> | 2004-05-03 15:00:45 +0000 |
|---|---|---|
| committer | Gerald Britton <gbritton@doomcom.org> | 2004-05-03 15:00:45 +0000 |
| commit | aa582477c591303dd1d29cca413d405ba45e4a6a (patch) | |
| tree | 30cddc39ee358d38fb0e4d560361e1ce034a6280 /glibc | |
| parent | 0b84df6bb86bdc34bcc9bf8d72a0f6e33c8a78dc (diff) | |
Merge ssh://openembedded@openembedded.bkbits.net/packages
into doomcom.org:/home/gbritton/devel/OE/packages
2004/05/03 11:00:32-04:00 doomcom.org!gbritton
LIBC->GLIBC namespace fix
BKrev: 40965e9dnF16iAjukuFV2EEM4pjOVA
Diffstat (limited to 'glibc')
| -rw-r--r-- | glibc/glibc-intermediate_cvs.oe | 4 | ||||
| -rw-r--r-- | glibc/glibc_cvs.oe | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/glibc/glibc-intermediate_cvs.oe b/glibc/glibc-intermediate_cvs.oe index d2d2423aef..1250bce73f 100644 --- a/glibc/glibc-intermediate_cvs.oe +++ b/glibc/glibc-intermediate_cvs.oe @@ -7,5 +7,5 @@ do_install () { PACKAGES = "" PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc" DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial" -LIBC_ADDONS = "linuxthreads" -LIBC_EXTRA_OECONF = "" +GLIBC_ADDONS = "linuxthreads" +GLIBC_EXTRA_OECONF = "" diff --git a/glibc/glibc_cvs.oe b/glibc/glibc_cvs.oe index 12f7152432..8b1f0d8294 100644 --- a/glibc/glibc_cvs.oe +++ b/glibc/glibc_cvs.oe @@ -6,8 +6,8 @@ SECTION = "libs" PRIORITY = "required" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -LIBC_ADDONS ?= "linuxthreads" -LIBC_EXTRA_OECONF ?= "" +GLIBC_ADDONS ?= "linuxthreads" +GLIBC_EXTRA_OECONF ?= "" # # For now, we will skip building of a gcc package if it is a uclibc one @@ -28,8 +28,8 @@ python __anonymous () { PACKAGES = "glibc glibc-dev glibc-doc glibc-i18n glibc-locale" # 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}']}" +PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" +DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']}" FILES_glibc_append = " ${datadir}/zoneinfo" FILES_glibc-dev_append = " ${libdir}/*.o" @@ -58,7 +58,7 @@ inherit autotools EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ - --enable-add-ons=${LIBC_ADDONS} --with-headers=${WORKDIR}/linux/include ${LIBC_EXTRA_OECONF}" + --enable-add-ons=${GLIBC_ADDONS} --with-headers=${WORKDIR}/linux/include ${GLIBC_EXTRA_OECONF}" glibcbuild_do_unpack () { # kernel headers |