[oe-commits] Koen Kooi : angstrom: blacklist libiconv for *glibc to stop people from corrupting their builds

Thu Oct 22 09:30:21 UTC 2009

Module: openembedded.git
Branch: shr/merge
Commit: 30776429ddedfc3ffd9d5b718bb755ee226ce739
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=30776429ddedfc3ffd9d5b718bb755ee226ce739

Author: Koen Kooi <koen at openembedded.org>
Date:   Thu Oct 22 11:09:56 2009 +0200

angstrom: blacklist libiconv for *glibc to stop people from corrupting their builds

---

 conf/distro/include/angstrom-eglibc.inc |    2 ++
 conf/distro/include/angstrom-glibc.inc  |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 2a1b7b0..e85b0b8 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -1,6 +1,8 @@
 # eglibc:
 require conf/distro/include/eglibc.inc
 
+ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used"
+
 TARGET_OS = "linux"
 
 TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 4488bec..183f0c1 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -1,6 +1,8 @@
 # glibc:
 require conf/distro/include/glibc-${TOOLCHAIN_TYPE}.inc
 
+ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used"
+
 TARGET_OS = "linux"
 TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 



