From 5c76c320af6f82794823215c081469d3de8e64e4 Mon Sep 17 00:00:00 2001 From: Gerald Britton Date: Tue, 27 Apr 2004 02:53:54 +0000 Subject: - binutils 2.15.90.0.3 / gcc 3.4.0 toolchain - support in glibc and uclibc for gcc 3.4.0 - new target setup for uclibc, TARGET_OS=linux-uclibc to match the uclibc project's setup and modern config.sub already has support for it. BKrev: 408dcb42JOaGKxGg3PSn6IwU4Kimfw --- glibc/glibc_cvs.oe | 52 ++++++++++++++++++++-------------------------------- 1 file changed, 20 insertions(+), 32 deletions(-) (limited to 'glibc/glibc_cvs.oe') diff --git a/glibc/glibc_cvs.oe b/glibc/glibc_cvs.oe index 97bcd98f66..9399895d03 100644 --- a/glibc/glibc_cvs.oe +++ b/glibc/glibc_cvs.oe @@ -6,37 +6,24 @@ SECTION = "libs" PRIORITY = "required" MAINTAINER = "Phil Blundell " -# We want to select whether we're building a uclibc or glibc system and -# perform provides accordingly. We want to trigger on the original -# TARGET_VENDOR setting, so we must do this before changing it. -def target_is_uclibc(d): - import oe - if (oe.data.getVar('TARGET_VENDOR', d, 1) == '-uclibc'): - return 1 - return 0 -def cond_provides(d): - import oe - if not target_is_uclibc(d): - return 'virtual/libc' - return '' -def cond_packages(d): - import oe - if not target_is_uclibc(d): - return 'glibc glibc-dev glibc-doc glibc-i18n glibc-locale' - oe.data.setVar('PACKAGE_NO_LOCALE', '1', d) - oe.data.setVar('PACKAGE_NO_GCONV', '1', d) - return 'glibc-compat' -PROVIDES := "${@cond_provides(d)}" -PACKAGES := "${@cond_packages(d)}" - -# When target is not a uclibc system, do a compat-only package -FILES_${PN}-compat = "${libdir}/lib*.so.* /lib/*.so*" - -# This will ONLY build to this target (we override it incase we're buliding -# the world for a uclibc system) -TARGET_VENDOR = "" -TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" -TARGET_PREFIX = "${TARGET_SYS}-" +# +# 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 oe, re + uc_os = (re.match('.*uclibc$', oe.data.getVar('TARGET_OS', d, 1)) != None) + if uc_os: + raise oe.parse.SkipPackage("incompatible with target %s" % + 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" @@ -56,7 +43,8 @@ SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \ file://${FILESDIR}/fhs-linux-paths.patch;patch=1;pnum=1 \ file://${FILESDIR}/arm-no-hwcap.patch;patch=1;pnum=0 \ file://${FILESDIR}/arm-memcpy.patch;patch=1;pnum=0 \ - file://${FILESDIR}/arm-longlong.patch;patch=1;pnum=0" + file://${FILESDIR}/arm-longlong.patch;patch=1;pnum=0 \ + file://${FILESDIR}/arm-machine-gmon.patch;patch=1;pnum=0" S = "${WORKDIR}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" -- cgit v1.2.3