diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-22 12:42:11 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-08-22 12:42:11 +0200 |
| commit | 2c84de509054d770081084ca223f55b67ef945db (patch) | |
| tree | 3ea01066e0499e567f7c6c89c62e45a8118dab19 /package | |
| parent | dfedf6631eaf8c669ec141f4cb1d21f93399a310 (diff) | |
| parent | 7a9453732c3443e61615a5ac08555c0f1fb4f495 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/eglibc/Makefile | 7 | ||||
| -rw-r--r-- | package/glibc/Makefile | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index d8bec6f9c..2a228fca7 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -23,12 +23,11 @@ ifeq ($(ADK_SSP),y) $(CP) $(STAGING_DIR)/lib/libssp.so* $(IDIR_EGLIBC)/lib/ endif $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_EGLIBC)/lib/ - $(CP) $(STAGING_DIR)/lib/ld-*.so* $(IDIR_EGLIBC)/lib/ - -for file in libc libcrypt libdl libm libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ + -for file in libc ld libcrypt libdl libm 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 - # create ld.so link for ldd - cd $(IDIR_EGLIBC)/lib && ln -sf ld-$(PKG_VERSION).so ld.so + # create ld.so link for x86 linker + cd $(IDIR_EGLIBC)/lib && ln -sf ld-$(PKG_VERSION).so ld-linux.so.2 include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/glibc/Makefile b/package/glibc/Makefile index b2e0d1a6f..f3c2bd9c7 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -28,7 +28,7 @@ endif $(CP) $(STAGING_DIR)/lib/$$file.so.* $(IDIR_GLIBC)/lib/; \ $(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib/; \ done - # create ld.so link for ldd - cd $(IDIR_GLIBC)/lib && ln -sf ld-linux.so.2 ld.so + # create ld.so link for mips gcc linker option + cd $(IDIR_GLIBC)/lib && ln -sf ld-linux.so.2 ld.so.1 include ${TOPDIR}/mk/pkg-bottom.mk |