diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:25:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:25:35 +0200 |
| commit | 98b7adfbd06f0f6bd99ca4805ca34250ee027fa1 (patch) | |
| tree | a68345ba8ba7ee532e4b7426cadad31d7add24c0 /package/glibc | |
| parent | 09d28322f4828a387eeee03d303c833eab8828c5 (diff) | |
| parent | 32a82e38679501da738199135b35f93ddc8aca0a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/glibc')
| -rw-r--r-- | package/glibc/Config.in.manual | 10 | ||||
| -rw-r--r-- | package/glibc/Makefile | 11 |
2 files changed, 0 insertions, 21 deletions
diff --git a/package/glibc/Config.in.manual b/package/glibc/Config.in.manual index dd5ab418a..5e5bd1dcc 100644 --- a/package/glibc/Config.in.manual +++ b/package/glibc/Config.in.manual @@ -7,13 +7,3 @@ config ADK_PACKAGE_GLIBC select ADK_PACKAGE_TZDATA help GNU C library. - -config ADK_PACKAGE_GLIBC_DEV - prompt "glibc-dev................ development files" - tristate - default n - depends on ADK_TARGET_LIB_GLIBC - help - GNU C library header files. - - diff --git a/package/glibc/Makefile b/package/glibc/Makefile index a03a5c8bd..d6f0f210e 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -29,16 +29,6 @@ INSTALL_STYLE:= manual # compile nothing, glibc is already build in toolchain directory do-install: -ifeq ($(ADK_TARGET_WITH_MULTILIB),y) - for abi in $(TABI); do \ - ${INSTALL_DIR} $(IDIR_GLIBC)/lib$${abi/*:/} $(IDIR_GLIBC)/usr/lib$${abi/*:/} ; \ - $(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_GLIBC)/lib$${abi/*:/} ; \ - -for file in libc libcrypt libdl libm libresolv libutil libnsl libnss_dns libnss_files; do \ - $(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/$$file.so* $(IDIR_GLIBC)/lib$${abi/*:/}; \ - $(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib$${abi/*:/}; \ - done ; \ - done -else ${INSTALL_DIR} ${IDIR_GLIBC}/$(ADK_TARGET_LIBC_PATH) $(CP) $(STAGING_TARGET_DIR)/lib/ld*.so* $(IDIR_GLIBC)/$(ADK_TARGET_LIBC_PATH) for file in libc libcrypt libdl libm libnsl libresolv libutil libnss_compat libnss_dns libnss_files; do \ @@ -50,7 +40,6 @@ else ifeq ($(ADK_LOCALES),y) $(CP) $(STAGING_TARGET_DIR)/usr/bin/locale $(IDIR_GLIBC)/usr/bin endif -endif ${INSTALL_DIR} ${IDIR_GLIBC}/etc ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc ${INSTALL_DATA} ./files/nsswitch.conf ${IDIR_GLIBC}/etc |