summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-10-22 11:09:56 +0200
committerKoen Kooi <koen@openembedded.org>2009-10-22 11:09:56 +0200
commit30776429ddedfc3ffd9d5b718bb755ee226ce739 (patch)
tree3ec4fee0597b191e7f602c3abb713567f0080ed7
parentb6f9e51b61dbd86ee1d33e5697a7471d7daee9c8 (diff)
angstrom: blacklist libiconv for *glibc to stop people from corrupting their builds
-rw-r--r--conf/distro/include/angstrom-eglibc.inc2
-rw-r--r--conf/distro/include/angstrom-glibc.inc2
2 files changed, 4 insertions, 0 deletions
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 2a1b7b059c..e85b0b8132 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 4488becd92..183f0c1d18 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']]}"