From 81c4c7c2cf2c5ff27a6c02e41bf484a53ea942c2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 16 Sep 2009 17:22:57 +0200
Subject: make adk compile system work on shuttle

- add some missing packages like cpio, lzma and gnu wget
- make microperl more featureful, needed for kernel-header
  installation
- make a dependency to perl
- fix header installation for $libc-dev package
- fix 64bit uclibc setup, simplify gcc patches

and totally unrelated
- add preliminary kvm and libvirt support (not tested)
---
 package/glibc/Makefile | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'package/glibc')

diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 479c8aab9..595ac3eda 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -23,30 +23,26 @@ do-install:
 ifeq ($(ADK_SSP),y)
 	$(CP) $(STAGING_DIR)/lib/libssp.so* $(IDIR_GLIBC)/lib/
 endif
-	$(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_GLIBC)/lib/
+	$(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 libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
-		$(CP) $(STAGING_DIR)/lib/$$file.so.* $(IDIR_GLIBC)/lib/; \
+		$(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 mips gcc linker option
 	cd $(IDIR_GLIBC)/lib && ln -sf ld-linux.so.2 ld.so.1
-	cd $(IDIR_GLIBC)/lib && ln -sf libgcc_s.so.1 libgcc_s.so
 	# header package
-	${INSTALL_DIR} $(IDIR_GLIBC_DEV)/usr/include/{sys,bits,linux,asm,asm-generic}
-	for file in \
-		regex errno limits alloca stdint locale ctype \
-		stdlib string sgidefs fcntl \
-		libintl sched pthread wchar _G_config getopt endian \
-		features libio stdio error signal time unistd \
-	;do \
-		${CP} $(STAGING_DIR)/usr/include/$$file.h \
-		$(IDIR_GLIBC_DEV)/usr/include; \
-	done
-	${CP} $(STAGING_DIR)/usr/include/asm/*.h $(IDIR_GLIBC_DEV)/usr/include/asm
-	${CP} $(STAGING_DIR)/usr/include/asm-generic/*.h $(IDIR_GLIBC_DEV)/usr/include/asm-generic
-	${CP} $(STAGING_DIR)/usr/include/sys/*.h $(IDIR_GLIBC_DEV)/usr/include/sys
-	${CP} $(STAGING_DIR)/usr/include/bits/*.h $(IDIR_GLIBC_DEV)/usr/include/bits
-	${CP} $(STAGING_DIR)/usr/include/linux/*.h $(IDIR_GLIBC_DEV)/usr/include/linux
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
+		INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \
+		headers_install
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/${PKG_NAME}-${PKG_VERSION} \
+		PREFIX=$(IDIR_GLIBC_DEV)/ \
+		DEVEL_PREFIX=/usr/ \
+		RUNTIME_PREFIX=$(IDIR_GLIBC_DEV)/ \
+		HOSTCC="$(HOSTCC)" \
+		CPU_CFLAGS="$(TARGET_CFLAGS)" \
+		install_headers
+	@find $(IDIR_GLIBC_DEV) -name .install -delete
+	@find $(IDIR_GLIBC_DEV) -name ..install.cmd -delete
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3