From abded6bfead49d61c24a45d811a83ca082adf677 Mon Sep 17 00:00:00 2001 From: Johan Derycke Date: Tue, 13 May 2014 18:10:18 +0200 Subject: [PATCH] icu: add an option to add a custom data library file [Thomas: - use one single BR2_PACKAGE_ICU_CUSTOM_DATA_PATH string option instead of a boolean option + a string option, which always causes a lot of issues with random configurations that enable the boolean option, but do not provide a valid value for the string option. - enclose the definition of ICU_COPY_CUSTOM_DATA into the condition.] Signed-off-by: Johan Derycke Signed-off-by: Thomas Petazzoni --- package/icu/Config.in | 12 ++++++++++++ package/icu/icu.mk | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/package/icu/Config.in b/package/icu/Config.in index 9a278942f8..d14f8d8e3c 100644 --- a/package/icu/Config.in +++ b/package/icu/Config.in @@ -13,6 +13,18 @@ config BR2_PACKAGE_ICU http://site.icu-project.org/ +if BR2_PACKAGE_ICU + +config BR2_PACKAGE_ICU_CUSTOM_DATA_PATH + string "Path to custom data library file" + help + This option allows to define the path to a custom data + library generated with + http://apps.icu-project.org/datacustom/ICUData51.html. Leave + empty to not use this functionality. + +endif + comment "icu needs a toolchain w/ C++, wchar, threads" depends on !BR2_arc depends on !BR2_BINFMT_FLAT diff --git a/package/icu/icu.mk b/package/icu/icu.mk index f93eab1476..208229d713 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -26,5 +26,12 @@ ICU_MAKE = $(MAKE1) ICU_SUBDIR = source HOST_ICU_SUBDIR = source +ifneq ($(BR2_PACKAGE_ICU_CUSTOM_DATA_PATH),) +define ICU_COPY_CUSTOM_DATA + cp $(BR2_PACKAGE_ICU_CUSTOM_DATA_PATH) $(@D)/source/data/in/ +endef +ICU_POST_PATCH_HOOKS += ICU_COPY_CUSTOM_DATA +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package)) -- 2.30.2