From 440dcafbd07915cadeb26806fe6d8835d62f293b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Oct 2012 19:42:00 +0200 Subject: support for 32/64 x86_64 multilib with eglibc --- package/busybox/Makefile | 2 +- package/eglibc/Makefile | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'package') diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 34b274d96..9fe1ef52a 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= e025414bc6cd79579cc7a32a45d3ae1c PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base -#PKG_BUILDDEP:= libtirpc +PKG_BUILDDEP:= libtirpc PKG_URL:= http://www.busybox.net/ PKG_SITES:= http://www.busybox.net/downloads/ diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 0ea35d935..40d1a4848 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -67,6 +67,14 @@ endif ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/nscd.conf ${IDIR_EGLIBC}/etc ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/nsswitch.conf ${IDIR_EGLIBC}/etc $(CP) $(STAGING_TARGET_DIR)/usr/bin/getconf $(IDIR_EGLIBC)/usr/bin +ifeq ($(ADK_TARGET_MULTILIB_X86_32),y) + ${INSTALL_DIR} $(IDIR_EGLIBC)/lib32 $(IDIR_EGLIBC)/usr/lib32 + $(CP) $(STAGING_TARGET_DIR_32)/lib/ld* $(IDIR_EGLIBC)/lib32 + -for file in libc libcrypt libdl libm libresolv libutil libnsl libnss_dns libnss_files; do \ + $(CP) $(STAGING_TARGET_DIR_32)/lib/$$file.so* $(IDIR_EGLIBC)/lib32; \ + $(CP) $(STAGING_TARGET_DIR_32)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib32; \ + done +endif eglibc-static-install: ${INSTALL_DIR} $(IDIR_EGLIBC_STATIC)/usr/lib -- cgit v1.2.3