diff options
| -rw-r--r-- | rules/glibc.in | 17 | ||||
| -rw-r--r-- | rules/glibc.make | 25 | ||||
| -rw-r--r-- | rules/pre/Rules.make | 17 |
3 files changed, 51 insertions, 8 deletions
diff --git a/rules/glibc.in b/rules/glibc.in index 1ddf56ca4..5d39a1ff1 100644 --- a/rules/glibc.in +++ b/rules/glibc.in @@ -189,10 +189,13 @@ config GLIBC_GCONV_ISO8859_15 comment "Timezone Files" depends on GLIBC_INSTALL +comment "glibc zoneinfo is BROKEN" + depends on GLIBC_INSTALL && !BROKEN + config GLIBC_ZONEINFO bool prompt "Install zoneinfo files" - depends on GLIBC_INSTALL + depends on GLIBC_INSTALL && BROKEN help FIXME: This item needs to be documented @@ -485,3 +488,15 @@ config GLIBC_ZONEINFO_UNIVERSAL bool prompt "Universal" depends on GLIBC_ZONEINFO + +comment "misc executeables" + +config GLIBC_LOCALE + bool + prompt "locale" + depends on GLIBC_INSTALL + +config GLIBC_LOCALEDEF + bool + prompt "localedef" + depends on GLIBC_INSTALL diff --git a/rules/glibc.make b/rules/glibc.make index 51a0b3b88..faccbdcbc 100644 --- a/rules/glibc.make +++ b/rules/glibc.make @@ -180,13 +180,24 @@ ifdef PTXCONF_GLIBC_GCONV_ISO8859_15 @$(call install_copy_toolchain_lib, glibc, gconv/ISO8859-15.so, /usr/lib/gconv) endif -# Zonefiles - @$(call install_copy, glibc, 0, 0, 0755, /usr/share/zoneinfo) - @for target in $(GLIBC_ZONEFILES-y); do \ - $(call install_copy, glibc, 0, 0, 0644, \ - $(GLIBC_ZONEDIR)/zoneinfo/$$target, \ - /usr/share/zoneinfo/$$target) \ - done; + +ifdef PTXCONF_GLIBC_LOCALE + @$(call install_copy_toolchain_other, glibc, bin/locale) +endif + +ifdef PTXCONF_GLIBC_LOCALEDEF + @$(call install_copy_toolchain_other, glibc, bin/localedef) +endif + + + +# Zonefiles are BROKEN +# @$(call install_copy, glibc, 0, 0, 0755, /usr/share/zoneinfo) +# @for target in $(GLIBC_ZONEFILES-y); do \ +# $(call install_copy, glibc, 0, 0, 0644, \ +# $(GLIBC_ZONEDIR)/zoneinfo/$$target, \ +# /usr/share/zoneinfo/$$target) \ +# done; @$(call install_finish, glibc) endif diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make index a7a854f04..3491c329e 100644 --- a/rules/pre/Rules.make +++ b/rules/pre/Rules.make @@ -986,6 +986,23 @@ install_copy_toolchain_lib = \ $(SCRIPTSDIR)/install_copy_toolchain.sh -p "$${PACKET}" -l "$${LIB}" $${DST} -s "$${STRIP}" # +# install_copy_toolchain_other +# +# $1: packet label +# $2: source +# $3: destination +# $4: strip (y|n) default is to strip +# +install_copy_toolchain_other = \ + PACKET=$(strip $(1)); \ + LIB="$(strip $2)"; \ + DST="$(strip $3)"; \ + STRIP="$(strip $4)"; \ + test "$${DST}" != "" && DST="-d $${DST}"; \ + ${CROSS_ENV_CC} $(CROSS_ENV_STRIP) \ + $(SCRIPTSDIR)/install_copy_toolchain.sh -p "$${PACKET}" -o "$${LIB}" $${DST} -s "$${STRIP}" + +# # install_copy_toolchain_dl # # $1: packet label |