diff options
| author | U-windows7\wbx <wbx@windows7.(none)> | 2009-12-19 20:39:23 +0100 |
|---|---|---|
| committer | U-windows7\wbx <wbx@windows7.(none)> | 2009-12-19 20:39:23 +0100 |
| commit | 99f2eaf540fc2a613b97560cc6e9a9de0937ac23 (patch) | |
| tree | 92a25e6a0f8cad4c511589eae0648696a176c82c /package/glibc | |
| parent | c58c1d4555c199939496713f231e45598b4d8ba7 (diff) | |
| parent | 1fda4ed40fe7fbab5db517a79ff8b13b33ca9355 (diff) | |
Merge branch 'master' of git://openadk.org/git/openadk
Diffstat (limited to 'package/glibc')
| -rw-r--r-- | package/glibc/Config.in | 2 | ||||
| -rw-r--r-- | package/glibc/Makefile | 19 |
2 files changed, 12 insertions, 9 deletions
diff --git a/package/glibc/Config.in b/package/glibc/Config.in index b6879a384..6e7db32c9 100644 --- a/package/glibc/Config.in +++ b/package/glibc/Config.in @@ -9,7 +9,7 @@ config ADK_PACKAGE_GLIBC config ADK_PACKAGE_GLIBC_DEV prompt "glibc-dev........................... development files" - bool + tristate default n depends on ADK_TARGET_LIB_GLIBC help 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 |