From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com ([192.55.52.93]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QW167-0002Fr-9t for openembedded-core@lists.openembedded.org; Mon, 13 Jun 2011 08:58:07 +0200 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 12 Jun 2011 23:54:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,356,1304319600"; d="scan'208";a="17500615" Received: from unknown (HELO swold-MOBL.bigsur.com) ([10.255.12.216]) by fmsmga001.fm.intel.com with ESMTP; 12 Jun 2011 23:54:39 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Sun, 12 Jun 2011 23:54:25 -0700 Message-Id: X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: Cc: Phil Blundell Subject: [*RFC CONSOLIDATED PULL RFC* 15/23] uclibc: remove redundant python code X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jun 2011 06:58:07 -0000 From: Phil Blundell 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 Signed-off-by: Khem Raj --- meta/recipes-core/uclibc/uclibc.inc | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc index 2bf3017..06c0f5d 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 \ -- 1.7.3.4