diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-19 10:49:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-19 10:49:49 +0200 |
| commit | 7907e3ee7302ac3fd428989a07b0df74f0c52853 (patch) | |
| tree | e6de18488a687707667927065724372b40510d65 /package/glibc | |
| parent | b70fdbfbf1139605c22083b647337f2b16f62fc3 (diff) | |
| parent | 61355d1f054c15673adeb62d32dfd4563f89c165 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/glibc')
| -rw-r--r-- | package/glibc/Config.in.manual | 4 | ||||
| -rw-r--r-- | package/glibc/Makefile | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/package/glibc/Config.in.manual b/package/glibc/Config.in.manual index 6e7db32c9..e149fb144 100644 --- a/package/glibc/Config.in.manual +++ b/package/glibc/Config.in.manual @@ -1,5 +1,5 @@ config ADK_PACKAGE_GLIBC - prompt "glibc............................... GNU C library" + prompt "glibc.................... GNU C library" bool default y if ADK_TARGET_LIB_GLIBC && !ADK_TOOLCHAIN_ONLY default n @@ -8,7 +8,7 @@ config ADK_PACKAGE_GLIBC GNU C library. config ADK_PACKAGE_GLIBC_DEV - prompt "glibc-dev........................... development files" + prompt "glibc-dev................ development files" tristate default n depends on ADK_TARGET_LIB_GLIBC diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 1a4a330e9..483c5244d 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -41,8 +41,9 @@ SUB_INSTALLS-${ADK_PACKAGE_GLIBC_DEV}+= glibc-dev-install # compile nothing, glibc is already build in toolchain directory do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc - # install /etc/localtime from host system (FIXME) - ${CP} /etc/localtime $(IDIR_GLIBC)/etc + test -z $(ADK_RUNTIME_TIMEZONE) || \ + $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ + $(IDIR_EGLIBC)/etc/localtime $(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_GLIBC)/lib/ $(CP) $(STAGING_DIR)/lib/ld*.so* $(IDIR_GLIBC)/lib/ -for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ |