summaryrefslogtreecommitdiff
path: root/package/glibc
diff options
context:
space:
mode:
Diffstat (limited to 'package/glibc')
-rw-r--r--package/glibc/Config.in0
-rw-r--r--package/glibc/Config.in.manual21
-rw-r--r--package/glibc/Makefile19
3 files changed, 20 insertions, 20 deletions
diff --git a/package/glibc/Config.in b/package/glibc/Config.in
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/glibc/Config.in
diff --git a/package/glibc/Config.in.manual b/package/glibc/Config.in.manual
index 6e01cfb02..6e7db32c9 100644
--- a/package/glibc/Config.in.manual
+++ b/package/glibc/Config.in.manual
@@ -1,21 +1,18 @@
-config ADK_COMPILE_GLIBC
- tristate
- depends on ADK_PACKAGE_GLIBC
- default n
-
config ADK_PACKAGE_GLIBC
- prompt "glibc............................. GNU C library"
- boolean
- select ADK_COMPILE_GLIBC
- depends on ADK_TARGET_LIB_GLIBC
+ prompt "glibc............................... GNU C library"
+ bool
default y if ADK_TARGET_LIB_GLIBC && !ADK_TOOLCHAIN_ONLY
+ default n
+ depends on ADK_TARGET_LIB_GLIBC
help
- GNU C library
+ GNU C library.
config ADK_PACKAGE_GLIBC_DEV
- prompt "glibc-dev.......................... GNU C library header files"
+ prompt "glibc-dev........................... development files"
tristate
default n
depends on ADK_TARGET_LIB_GLIBC
help
- GNU C library header files
+ GNU C library header files.
+
+
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 3cd49f64b..45145d230 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -28,17 +28,17 @@ GLIBC_CONFOPTS:= \
--enable-add-ons
$(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,GLIBC_DEV,glibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-do-extract:
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_GLIBC_DEV}+= glibc-dev-install
-# do nothing, glibc is already build in toolchain directory
-do-install:
+# compile nothing, glibc is already build in toolchain directory
+do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc
# install /etc/localtime from host system (FIXME)
${CP} /etc/localtime $(IDIR_GLIBC)/etc
-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/ld-*.so* $(IDIR_GLIBC)/lib/
-for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \
@@ -47,8 +47,11 @@ endif
done
# create ld.so link for mips gcc linker option
cd $(IDIR_GLIBC)/lib && ln -sf ld-linux.so.2 ld.so.1
+
+glibc-dev-install:
# header package
- $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
+ $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
+ HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \
headers_install
(cd $(WRKBUILD); \
@@ -63,6 +66,6 @@ endif
install-headers
touch $(IDIR_GLIBC_DEV)/usr/include/gnu/stubs.h
touch $(IDIR_GLIBC_DEV)/usr/include/bits/stdio_lim.h
- @find $(IDIR_GLIBC_DEV) -name .install -delete
+ @find $(IDIR_GLIBC_DEV) -name .install -exec rm {} \;
include ${TOPDIR}/mk/pkg-bottom.mk