summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rules/glibc.in14
-rw-r--r--rules/glibc.make17
2 files changed, 29 insertions, 2 deletions
diff --git a/rules/glibc.in b/rules/glibc.in
index ffb830516..7296742cc 100644
--- a/rules/glibc.in
+++ b/rules/glibc.in
@@ -189,20 +189,32 @@ config GLIBC_I18N_RAWDATA
menu "Install gconv libraries "
+config GLIBC_GCONF_BASE
+ bool
+
config GLIBC_GCONV_DEF
bool
prompt "default gconv modules"
+ select GLIBC_GCONF_BASE
default y
help
install the iso8859-1 (Latin Alphabet No.1) and the iso8859-15 (Latin
Alphabet No.9) encoding modules into gconv, this should be ok for most
western languages
+config GLIBC_GCONV_UTF
+ bool
+ prompt "gconv modules for UTF"
+ select GLIBC_GCONF_BASE
+ help
+ install the gconv modules for UTF conversion
+
config GLIBC_GCONV_ZH
bool
prompt "gconv modules for chinese language"
+ select GLIBC_GCONF_BASE
help
- install the gconv modules for chinese language, including BIG5, GB2312
+ install the gconv modules for chinese language, including BIG5
and GB18030
endmenu
diff --git a/rules/glibc.make b/rules/glibc.make
index babcf842c..e01ae3a37 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -145,13 +145,28 @@ ifdef PTXCONF_GLIBC_NSL
@$(call install_copy_toolchain_lib, glibc, libnsl.so)
endif
-ifdef PTXCONF_GLIBC_GCONV_DEF
+ifdef PTXCONF_GLIBC_GCONF_BASE
@$(call install_copy, glibc, 0, 0, 0755, /usr/lib/gconv)
@$(call install_copy_toolchain_lib, glibc, gconv/gconv-modules, /usr/lib/gconv, n)
+endif
+
+ifdef PTXCONF_GLIBC_GCONV_DEF
@$(call install_copy_toolchain_lib, glibc, gconv/ISO8859-1.so, /usr/lib/gconv)
@$(call install_copy_toolchain_lib, glibc, gconv/ISO8859-15.so, /usr/lib/gconv)
endif
+ifdef PTXCONF_GLIBC_GCONV_UTF
+ @$(call install_copy_toolchain_lib, glibc, gconv/UNICODE.so, /usr/lib/gconv)
+ @$(call install_copy_toolchain_lib, glibc, gconv/UTF-16.so, /usr/lib/gconv)
+ @$(call install_copy_toolchain_lib, glibc, gconv/UTF-32.so, /usr/lib/gconv)
+ @$(call install_copy_toolchain_lib, glibc, gconv/UTF-7.so, /usr/lib/gconv)
+endif
+
+ifdef PTXCONF_GLIBC_GCONV_ZH
+ @$(call install_copy_toolchain_lib, glibc, gconv/GBBIG5.so, /usr/lib/gconv)
+ @$(call install_copy_toolchain_lib, glibc, gconv/GB18030.so, /usr/lib/gconv)
+endif
+
ifdef PTXCONF_GLIBC_I18N_BIN_LOCALE
@$(call install_copy_toolchain_usr, glibc, bin/locale)
endif