Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to use icu 65.1, enable to provide filters data file path #217

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Switch to use icu 65.1, enable to provide filters data file path #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions package/icu/65.1/0006-add-icu-data-filter-file.patch
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions package/icu/Config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ config BR2_PACKAGE_ICU_USE_ICUDATA

endif

if BR2_PACKAGE_ICU

config BR2_PACKAGE_ICU_FILTERS_DATA_PATH
string "Path to filters data file"
help
This option allows to define the path to a filters data
file.
Leave empty to not use this functionality.
endif
Comment on lines +27 to +33
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By default, it will increase the size of zImage (with ramfs) significantly.
As there is no default filter defined, it will generate full icu data e.g. it will increase icudata size by 22MB and zImage size by 10MB.
Please cross-check if this size increase is OK.


if BR2_PACKAGE_ICU && !BR2_PACKAGE_ICU_USE_ICUDATA

config BR2_PACKAGE_ICU_CUSTOM_DATA_PATH
Expand Down
25 changes: 7 additions & 18 deletions package/icu/icu.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,21 @@
#
################################################################################

ifeq ($(BR2_PACKAGE_RDK_VERSIONING),y)
ICU_VERSION = 57.1
else ifeq ($(BR2_PACKAGE_NETFLIX5),y)
ICU_VERSION = 65.1
else ifeq ($(BR2_PACKAGE_NETFLIX52),y)
ICU_VERSION = 65.1
else
ICU_VERSION = 57.1
endif

ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz
ifeq ($(ICU_VERSION), 65.1)
ICU_SITE = \
https://github.com/unicode-org/icu/releases/download/release-$(subst .,-,$(ICU_VERSION))
ICU_LICENSE = ICU License
ICU_LICENSE_FILES = LICENSE

ICU_FILTERS_DATA_PATH = $(call qstrip,$(BR2_PACKAGE_ICU_FILTERS_DATA_PATH))
# Force to build icudate, as of ICU 64 the website to generate icudate is no longer applicable
# If someone needs to build it outside still mk file is able to support it
ICU_BUILD_ICUDATA = y
Comment on lines +17 to 18
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

icudata.mk and Config.in may also be modified as it is always building icudata and not using pre-generated icudata from Metrological repository.

export ICU_DATA_FILTER_FILE=$(HOST_ICU_DIR)/source/data/filters.json
else
ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION)
ICU_LICENSE = ICU License
ICU_LICENSE_FILES = license.html

ifneq ($(ICU_FILTERS_DATA_PATH),)
export ICU_DATA_FILTER_FILE=$(ICU_FILTERS_DATA_PATH)
endif

ICU_DEPENDENCIES = host-icu
Expand Down Expand Up @@ -63,11 +56,7 @@ HOST_ICU_CONF_ENV = CXX="$(HOSTCXX_NOCCACHE)" CC="$(HOSTCC_NOCCACHE)"

ifeq ($(BR2_PACKAGE_ICU_USE_ICUDATA),y)
ICU_DEPENDENCIES += icudata
ifeq ($(ICU_BUILD_ICUDATA), y)
ICU_PRE_PATCH_HOOKS += ICUDATA_EXTRACT
else
ICU_POST_PATCH_HOOKS += ICUDATA_EXTRACT
endif
endif

ICU_CUSTOM_DATA_PATH = $(call qstrip,$(BR2_PACKAGE_ICU_CUSTOM_DATA_PATH))
Expand Down