diff options
| -rw-r--r-- | package/glibc/Makefile | 32 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile | 27 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile.inc | 24 |
3 files changed, 28 insertions, 55 deletions
diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 6d9be792c..e995cb957 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -13,33 +13,6 @@ NO_DISTFILES:= 1 include $(TOPDIR)/mk/package.mk -GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ - --host=$(REAL_GNU_TARGET_NAME) \ - --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ - --disable-nls \ - --disable-sanity-checks \ - --disable-nls \ - --without-cvs \ - --disable-profile \ - --disable-debug \ - --without-gd \ - --with-__thread \ - --with-tls \ - --enable-kernel="2.6.0" \ - --enable-add-ons - -GLIBC_ENV:= PATH='${TARGET_PATH}' \ - BUILD_CC=${HOSTCC} \ - CFLAGS="$(TARGET_CFLAGS)" \ - CC=${REAL_GNU_TARGET_NAME}-gcc \ - CXX=${REAL_GNU_TARGET_NAME}-g++ \ - AR=${REAL_GNU_TARGET_NAME}-ar \ - RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \ - libc_cv_forced_unwind=yes \ - libc_cv_c_cleanup=yes \ - libc_cv_gnu99_inline=yes \ - libc_cv_slibdir="/lib" - $(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})) @@ -59,7 +32,7 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} $(IDIR_GLIBC)/etc/localtime $(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 \ + -for file in libc libcrypt libdl libm 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 @@ -70,6 +43,9 @@ glibc-dev-install: -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 + -for file in libc libcrypt libdl libm libresolv librt libutil; do \ + cd $(IDIR_GLIBC_DEV)/lib/; ln -sf $$file-$(PKG_VERSION).so $$file.so; \ + done # header package $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \ HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \ diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index f97185ab5..47a7b9d6b 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -4,7 +4,6 @@ include $(TOPDIR)/rules.mk include ../rules.mk include Makefile.inc - include ${TOPDIR}/mk/buildhlp.mk # glibc does not compile with Os @@ -13,32 +12,6 @@ ifneq ($(ADK_DEBUG),) TARGET_CFLAGS+=-O2 endif -GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ - --host=$(REAL_GNU_TARGET_NAME) \ - --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ - --disable-nls \ - --disable-sanity-checks \ - --without-cvs \ - --disable-profile \ - --disable-debug \ - --enable-kernel="2.6.0" \ - --without-gd \ - --with-__thread \ - --with-tls \ - --enable-add-ons - -GLIBC_ENV:= PATH='${TARGET_PATH}' \ - BUILD_CC=${HOSTCC} \ - CFLAGS="$(TARGET_CFLAGS)" \ - CC=${REAL_GNU_TARGET_NAME}-gcc \ - CXX=${REAL_GNU_TARGET_NAME}-g++ \ - AR=${REAL_GNU_TARGET_NAME}-ar \ - RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \ - libc_cv_forced_unwind=yes \ - libc_cv_c_cleanup=yes \ - libc_cv_gnu99_inline=yes \ - libc_cv_slibdir="/lib" - ifeq ($(ADK_TARGET_NO_FPU),y) GLIBC_CONFOPTS+= --without-fp endif diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 57f4c5aff..414790a23 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -7,3 +7,27 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= a8e77cd873125d9b46ca2e46ee1a13d0 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} GLIBC_PORTS_VERSION:= 2.12 +GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ + --host=$(REAL_GNU_TARGET_NAME) \ + --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ + --disable-nls \ + --disable-sanity-checks \ + --disable-nls \ + --without-cvs \ + --disable-profile \ + --disable-debug \ + --without-gd \ + --with-__thread \ + --with-tls \ + --enable-kernel="2.6.0" \ + --enable-add-ons +GLIBC_ENV:= PATH='${TARGET_PATH}' \ + BUILD_CC=${HOSTCC} \ + CFLAGS="$(TARGET_CFLAGS)" \ + CC=${REAL_GNU_TARGET_NAME}-gcc \ + CXX=${REAL_GNU_TARGET_NAME}-g++ \ + AR=${REAL_GNU_TARGET_NAME}-ar \ + RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \ + libc_cv_forced_unwind=yes \ + libc_cv_c_cleanup=yes \ + libc_cv_gnu99_inline=yes \ |