diff options
Diffstat (limited to 'package/glibc/Makefile')
| -rw-r--r-- | package/glibc/Makefile | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/package/glibc/Makefile b/package/glibc/Makefile index c068c3606..084a71918 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -28,31 +28,41 @@ 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: +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual -# do nothing, glibc is already build in toolchain directory -do-install: +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_GLIBC_DEV}+= glibc-dev-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 libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ + -for file in libc libcrypt libdl libm libnsl libresolv librt libutil libnss_compat libnss_dns libnss_files; do \ $(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 + +glibc-dev-install: + ${INSTALL_DIR} $(IDIR_GLIBC_DEV)/lib $(IDIR_GLIBC_DEV)/usr/lib + # install linker script + -cp ./files/libc.so.$(ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so + ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GLIBC_DEV}/usr/lib + ${CP} ${STAGING_DIR}/usr/lib/libc_nonshared.a ${IDIR_GLIBC_DEV}/usr/lib # header package - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \ + $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \ + HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \ INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \ headers_install (cd $(WRKBUILD); \ - $(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/configure \ + $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/configure \ --prefix=/usr \ --with-sysroot=$(IDIR_GLIBC_DEV) \ ${GLIBC_CONFOPTS} \ @@ -63,6 +73,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 |