From patchwork Fri Jun 10 14:01:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: uclibc: remove redundant python code Date: Fri, 10 Jun 2011 14:01:40 -0000 From: Phil Blundell X-Patchwork-Id: 5639 Message-Id: <1307714500.25285.7.camel@phil-desktop> To: Patches and discussions about the oe-core layer This chunk of python code has been around for a while (witness the comment about gcc 3.4.0) and predates the availability of COMPATIBLE_HOST. Rewrite it using a more modern idiom. Signed-off-by: Phil Blundell Acked-by: Khem Raj --- meta/recipes-core/uclibc/uclibc.inc | 12 +-------- diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc index c1bc422..a2c6ee5 100644 --- a/meta/recipes-core/uclibc/uclibc.inc +++ b/meta/recipes-core/uclibc/uclibc.inc @@ -36,21 +36,11 @@ cp ${SYSROOT_DESTDIR}${libdir}/libc.so ${WORKDIR}/site_config_libc; \ sed -i -e 's# ${base_libdir}# ${SYSROOT_DESTDIR}${base_libdir}#g' -e 's# ${libdir}# ${SYSROOT_DESTDIR}${libdir}#g' ${WORKDIR}/site_config_libc/libc.so; \ " -# # 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 -# +COMPATIBLE_HOST = ".*-uclibc.*" -python __anonymous () { - import bb, re - uc_os = (re.match('.*uclibc*', bb.data.getVar('TARGET_OS', d, 1)) != None) - if not uc_os: - raise bb.parse.SkipPackage("incompatible with target %s" % - bb.data.getVar('TARGET_OS', d, 1)) -} PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" DEPENDS = "virtual/${TARGET_PREFIX}binutils \ virtual/${TARGET_PREFIX}gcc-intermediate \