diff options
| author | Holger Schurig <schurig@mn-solutions.de> | 2005-04-21 07:08:16 +0000 |
|---|---|---|
| committer | Holger Schurig <schurig@mn-solutions.de> | 2005-04-21 07:08:16 +0000 |
| commit | e09fa333f0878da81501c4d3409670372899bae4 (patch) | |
| tree | d7c9ff526801bb8f9736e0f2ca476d2f49ba9b87 /packages/glibc/glibc_2.3.2+cvs20040726.bb | |
| parent | b3c0f245ce2ff1a73f4546339ce3faba44bbfc5d (diff) | |
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into mnz66.mn-solutions.de:/usr/src/mnci54/oe
2005/04/21 08:03:47+01:00 reciva.com!pb
move some more common glibc bits into glibc-package.bbclass
BKrev: 42675160QJABzuRNjNcLgszukeMUTQ
Diffstat (limited to 'packages/glibc/glibc_2.3.2+cvs20040726.bb')
| -rw-r--r-- | packages/glibc/glibc_2.3.2+cvs20040726.bb | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index 6fdb094205..013956b8af 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -4,30 +4,13 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "linux-libc-headers" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r16" +PR = "r17" GLIBC_ADDONS ?= "linuxthreads" GLIBC_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 -# is a uclibc build. -# -# See the note in gcc/gcc_3.4.0.oe -# - -python __anonymous () { - import bb, re - uc_os = (re.match('.*uclibc$', bb.data.getVar('TARGET_OS', d, 1)) != None) - if uc_os: - raise bb.parse.SkipPackage("incompatible with target %s" % - bb.data.getVar('TARGET_OS', d, 1)) -} - # nptl needs unwind support in gcc, which can't be built without glibc. PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}" PROVIDES += "virtual/libintl virtual/libiconv" @@ -60,7 +43,6 @@ B = "${WORKDIR}/build-${TARGET_SYS}" inherit autotools - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ @@ -68,16 +50,6 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --with-headers=${CROSS_DIR}/${TARGET_SYS}/include \ ${GLIBC_EXTRA_OECONF}" -EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" - -OVERRIDES_append = ":${TARGET_ARCH}-${TARGET_OS}" -EXTRA_OECONF_append_arm-linuxeabi = " --without-fp" - -def get_glibc_fpu_setting(bb, d): - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: - return "--without-fp" - return "" - do_configure () { # override this function to avoid the autoconf/automake/aclocal/autoheader # calls for now |