| Submitter | Phil Blundell |
|---|---|
| Date | June 10, 2011, 2:01 p.m. |
| Message ID | <1307714500.25285.7.camel@phil-desktop> |
| Download | mbox | patch |
| Permalink | /patch/5639/ |
| State | New, archived |
| Headers | show |
Comments
On 06/10/2011 07:01 AM, Phil Blundell wrote: > 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<philb@gnu.org> Acked-by: Khem Raj <raj.khem@gmail.com> > --- > 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 \ > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Patch
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 \
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 <philb@gnu.org> --- meta/recipes-core/uclibc/uclibc.inc | 12 +--------