summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-05-09 14:46:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-15 10:00:30 +0100
commita4c29153c7ffef024b31e7e3a197a09758a7beb4 (patch)
treee0519879c5cf4c3856d049203b248c98d6fa22d2 /meta
parent5e7d337fd538325e5f69de5b409eb8e36bb5e007 (diff)
downloadopenembedded-core-a4c29153c7ffef024b31e7e3a197a09758a7beb4.tar.gz
icu: move ASNEEDED over-ride into icu.inc
Move the recipe specific over-ride for ASNEEDED into the recipe to make it more apparent that the over-ride is being applied (and that it should be re-checked on version updates, etc). Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/as-needed.inc1
-rw-r--r--meta/recipes-support/icu/icu.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc
index 94f5b90593..305e654ca9 100644
--- a/meta/conf/distro/include/as-needed.inc
+++ b/meta/conf/distro/include/as-needed.inc
@@ -2,7 +2,6 @@
ASNEEDED = "-Wl,--as-needed"
ASNEEDED_pn-openobex = ""
-ASNEEDED_pn-icu = ""
ASNEEDED_pn-pciutils = ""
ASNEEDED_pn-puzzles = ""
ASNEEDED_pn-rpm = ""
diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc
index 983118cd61..f0786baa03 100644
--- a/meta/recipes-support/icu/icu.inc
+++ b/meta/recipes-support/icu/icu.inc
@@ -31,6 +31,8 @@ EXTRA_OECONF_class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE}"
EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}"
TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}"
+ASNEEDED = ""
+
# strtod_l() is not supported by musl; also xlocale.h is missing
# It is not possible to disable its use via configure switches or env vars
# so monkey patching is needed.