diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-01 19:45:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-01 19:45:20 +0100 |
| commit | 269e98c93f1bff77dc33701f1e5e8615a031ec0b (patch) | |
| tree | d6e35e6da4bc19f657ac07ff8447ec065d85a4aa /package/eglibc | |
| parent | d1b6ea47f57cbcac8543a4dba976e13e3bc2e985 (diff) | |
| parent | 2a8b0c42a074556bd489ef88a2b788f84ff6cf1e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/eglibc')
| -rw-r--r-- | package/eglibc/Makefile | 22 | ||||
| -rw-r--r-- | package/eglibc/files/libc.so.x86 | 5 |
2 files changed, 18 insertions, 9 deletions
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index de7c80e45..83d74ab10 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -46,24 +46,28 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ # compile nothing, eglibc is already build in toolchain directory do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} - ${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc $(IDIR_EGLIBC)/usr/lib + ${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \ + $(IDIR_EGLIBC)/usr/lib # install /etc/localtime from host system (FIXME) ${CP} /etc/localtime $(IDIR_EGLIBC)/etc - $(CP) $(STAGING_DIR)/lib/ld-* $(IDIR_EGLIBC)/lib/ + $(CP) $(STAGING_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/ $(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_EGLIBC)/lib/ -for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ $(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \ $(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \ done - # install linker script - -cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC)/usr/lib/libc.so - cd $(IDIR_EGLIBC)/lib && ln -sf libm.so.6 libm.so - cd $(IDIR_EGLIBC)/lib && ln -sf libutil.so.1 libutil.so - cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so - cd $(IDIR_EGLIBC)/lib && ln -sf libcrypt.so.1 libcrypt.so - cd $(IDIR_EGLIBC)/lib && ln -sf libdl.so.2 libdl.so eglibc-dev-install: + ${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib $(IDIR_EGLIBC_DEV)/usr/lib + # install linker script + -cp ./files/libc.so.$(ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so + ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib + ${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib + cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libm.so.6 libm.so + cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libutil.so.1 libutil.so + cd $(IDIR_EGLIBC_DEV)/lib && ln -sf librt.so.1 librt.so + cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libcrypt.so.1 libcrypt.so + cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libdl.so.2 libdl.so # header package $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \ HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \ diff --git a/package/eglibc/files/libc.so.x86 b/package/eglibc/files/libc.so.x86 new file mode 100644 index 000000000..cd8724cc5 --- /dev/null +++ b/package/eglibc/files/libc.so.x86 @@ -0,0 +1,5 @@ +/* GNU ld script + Use the shared library, but some functions are only in + the static library, so try that secondarily. */ +OUTPUT_FORMAT(elf32-i386) +GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) ) |