From 6830323ac605f11eb3a377517cddafbe240e0e5f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 9 Sep 2009 20:36:18 +0200
Subject: optimize libc-dev package

- remove some leftover debug code
- add more header files in libc-dev packages
- fix qemu-mips* hints
---
 package/eglibc/Makefile | 12 ++++++++++--
 package/glibc/Config.in |  9 +++++++++
 package/glibc/Makefile  | 17 +++++++++++++++++
 package/uclibc/Makefile | 16 +++++++++++-----
 4 files changed, 47 insertions(+), 7 deletions(-)

(limited to 'package')

diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 112772a7d..a884cb37f 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -34,13 +34,21 @@ endif
 	cd $(IDIR_EGLIBC)/lib && ln -sf libc.so.6 libc.so
 	cd $(IDIR_EGLIBC)/lib && ln -sf libgcc_s.so.1 libgcc_s.so
 	# header package
-	${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/usr/include/{sys,bits,gnu}
-	for file in pthread sched wchar _G_config getopt endian features libio stdio error signal time unistd;do \
+	${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/usr/include/{sys,bits,gnu,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_EGLIBC_DEV)/usr/include; \
 	done
+	${CP} $(STAGING_DIR)/usr/include/asm/*.h $(IDIR_EGLIBC_DEV)/usr/include/asm
+	${CP} $(STAGING_DIR)/usr/include/asm-generic/*.h $(IDIR_EGLIBC_DEV)/usr/include/asm-generic
 	${CP} $(STAGING_DIR)/usr/include/sys/*.h $(IDIR_EGLIBC_DEV)/usr/include/sys
 	${CP} $(STAGING_DIR)/usr/include/bits/*.h $(IDIR_EGLIBC_DEV)/usr/include/bits
 	${CP} $(STAGING_DIR)/usr/include/gnu/*.h $(IDIR_EGLIBC_DEV)/usr/include/gnu
+	${CP} $(STAGING_DIR)/usr/include/linux/*.h $(IDIR_EGLIBC_DEV)/usr/include/linux
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glibc/Config.in b/package/glibc/Config.in
index 702870201..35e630dc7 100644
--- a/package/glibc/Config.in
+++ b/package/glibc/Config.in
@@ -7,3 +7,12 @@ config ADK_PACKAGE_GLIBC
 	help
 	  GNU C library.
 
+config ADK_PACKAGE_GLIBC_DEV
+	prompt "glibc-dev........................... development files"
+	bool
+	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 e8ba0cd91..479c8aab9 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -31,5 +31,22 @@ endif
 	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
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index c5d2f01a9..e961ee86b 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -33,14 +33,20 @@ do-install:
 	cd $(IDIR_UCLIBC)/lib && ln -sf libc.so.0 libc.so
 	cd $(IDIR_UCLIBC)/lib && ln -sf libgcc_s.so.1 libgcc_s.so
 	# header package
-	${INSTALL_DIR} $(IDIR_UCLIBC_DEV)/usr/include/{sys,bits}
-	for file in alloca stdint locale ctype stdlib string sgidefs \
+	${INSTALL_DIR} $(IDIR_UCLIBC_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_UCLIBC_DEV)/usr/include; \
+		features libio stdio error signal time unistd \
+	;do \
+		${CP} $(STAGING_DIR)/usr/include/$$file.h \
+		$(IDIR_UCLIBC_DEV)/usr/include; \
 	done
+	${CP} $(STAGING_DIR)/usr/include/asm/*.h $(IDIR_UCLIBC_DEV)/usr/include/asm
+	${CP} $(STAGING_DIR)/usr/include/asm-generic/*.h $(IDIR_UCLIBC_DEV)/usr/include/asm-generic
 	${CP} $(STAGING_DIR)/usr/include/sys/*.h $(IDIR_UCLIBC_DEV)/usr/include/sys
 	${CP} $(STAGING_DIR)/usr/include/bits/*.h $(IDIR_UCLIBC_DEV)/usr/include/bits
+	${CP} $(STAGING_DIR)/usr/include/linux/*.h $(IDIR_UCLIBC_DEV)/usr/include/linux
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3