diff options
Diffstat (limited to 'package/eglibc')
| -rw-r--r-- | package/eglibc/Config.in | 2 | ||||
| -rw-r--r-- | package/eglibc/Makefile | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/package/eglibc/Config.in b/package/eglibc/Config.in index 6265c5b58..6e1daf463 100644 --- a/package/eglibc/Config.in +++ b/package/eglibc/Config.in @@ -9,7 +9,7 @@ config ADK_PACKAGE_EGLIBC config ADK_PACKAGE_EGLIBC_DEV prompt "eglibc-dev........................... development files" - bool + tristate default n depends on ADK_TARGET_LIB_EGLIBC help diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index a7cf97fbe..de7c80e45 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -14,6 +14,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,EGLIBC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,EGLIBC_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_EGLIBC_DEV}+= eglibc-dev-install + EGLIBC_CONFOPTS:= \ --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ @@ -40,16 +44,11 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ libc_cv_gnu99_inline=yes \ libc_cv_slibdir="/lib" -do-extract: - -# do nothing, eglibc is already build in toolchain directory -do-install: +# compile nothing, eglibc is already build in toolchain directory +do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc $(IDIR_EGLIBC)/usr/lib # install /etc/localtime from host system (FIXME) ${CP} /etc/localtime $(IDIR_EGLIBC)/etc -ifeq ($(ADK_SSP),y) - $(CP) $(STAGING_DIR)/lib/libssp.so* $(IDIR_EGLIBC)/lib/ -endif $(CP) $(STAGING_DIR)/lib/ld-* $(IDIR_EGLIBC)/lib/ $(CP) $(STAGING_DIR)/lib/libgcc_s.so* $(IDIR_EGLIBC)/lib/ -for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ @@ -63,8 +62,11 @@ endif cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so cd $(IDIR_EGLIBC)/lib && ln -sf libcrypt.so.1 libcrypt.so cd $(IDIR_EGLIBC)/lib && ln -sf libdl.so.2 libdl.so + +eglibc-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_EGLIBC_DEV)/usr \ headers_install (cd $(WRKBUILD); \ @@ -77,6 +79,6 @@ endif PATH='${TARGET_PATH}' \ $(MAKE) -C $(WRKBUILD) \ install-headers install-bootstrap-headers=yes - @find $(IDIR_EGLIBC_DEV) -name .install -delete + @find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \; include ${TOPDIR}/mk/pkg-bottom.mk |