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:56:50 +0100
commit08cdb50847b6abd443324169c655275a6c9ce99a (patch)
treed31f216dded6f89aa00180a2de02db6852eed4e6 /meta
parent6c2ae5900dcd71a9a7840f661a16bcbd4af02c53 (diff)
downloadpoky-08cdb50847b6abd443324169c655275a6c9ce99a.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). (From OE-Core rev: a4c29153c7ffef024b31e7e3a197a09758a7beb4) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@
2ASNEEDED = "-Wl,--as-needed" 2ASNEEDED = "-Wl,--as-needed"
3 3
4ASNEEDED_pn-openobex = "" 4ASNEEDED_pn-openobex = ""
5ASNEEDED_pn-icu = ""
6ASNEEDED_pn-pciutils = "" 5ASNEEDED_pn-pciutils = ""
7ASNEEDED_pn-puzzles = "" 6ASNEEDED_pn-puzzles = ""
8ASNEEDED_pn-rpm = "" 7ASNEEDED_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}"
31EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" 31EXTRA_OECONF_append_class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}"
32TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" 32TARGET_CXXFLAGS_append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}"
33 33
34ASNEEDED = ""
35
34# strtod_l() is not supported by musl; also xlocale.h is missing 36# strtod_l() is not supported by musl; also xlocale.h is missing
35# It is not possible to disable its use via configure switches or env vars 37# It is not possible to disable its use via configure switches or env vars
36# so monkey patching is needed. 38# so monkey patching is needed.