diff options
Diffstat (limited to 'toolchain/eglibc')
| -rw-r--r-- | toolchain/eglibc/Makefile | 21 | ||||
| -rw-r--r-- | toolchain/eglibc/Makefile.inc | 2 | ||||
| -rw-r--r-- | toolchain/eglibc/patches/eglibc-cross.patch | 2 |
3 files changed, 18 insertions, 7 deletions
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index a4d54bb69..c5f2a5653 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -4,7 +4,6 @@ include $(TOPDIR)/rules.mk include ../rules.mk include Makefile.inc - include ${TOPDIR}/mk/buildhlp.mk ifneq ($(ADK_DEBUG),) @@ -51,8 +50,8 @@ $(WRKBUILD)/.headers_configure: (cd $(EGLIBC_BUILD_DIR_INITIAL); \ ${EGLIBC_ENV} \ $(WRKBUILD)/libc/configure \ - --prefix=$(TOOLCHAIN_SYSROOT)/usr \ - --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ + --prefix=$(STAGING_TARGET_DIR)/usr \ + --with-headers=$(STAGING_TARGET_DIR)/usr/include \ ${EGLIBC_CONFOPTS} \ ); touch $@ @@ -62,9 +61,15 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure PATH='${TARGET_PATH}' \ $(MAKE) install-headers install-bootstrap-headers=yes \ ); - touch $(TOOLCHAIN_SYSROOT)/usr/include/gnu/stubs.h + touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h touch $@ +ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +EGLIBC_ENV+= libc_cv_ssp=yes +else +EGLIBC_ENV+= libc_cv_ssp=no +endif + $(WRKBUILD)/.configured: mkdir -p $(EGLIBC_BUILD_DIR_FINAL) $(CP) ${TOPDIR}/toolchain/eglibc/eglibc.config \ @@ -79,12 +84,16 @@ $(WRKBUILD)/.configured: ); touch $@ -$(WRKBUILD)/.compiled: +$(EGLIBC_BUILD_DIR_FINAL)/libc.so: +$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) all touch $@ -$(WRKBUILD)/.installed: +$(WRKBUILD)/.installed: $(EGLIBC_BUILD_DIR_FINAL)/libc.so ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) install_root=$(STAGING_TARGET_DIR) install + ${INSTALL_DATA} ${WRKBUILD}/libc/posix/gai.conf ${STAGING_TARGET_DIR}/etc/ + ${INSTALL_DATA} ${WRKBUILD}/libc/nscd/nscd.conf ${STAGING_TARGET_DIR}/etc/ + ${INSTALL_DATA} ${WRKBUILD}/libc/nss/nsswitch.conf ${STAGING_TARGET_DIR}/etc/ touch $@ include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc index 51fefa6d5..42e80e858 100644 --- a/toolchain/eglibc/Makefile.inc +++ b/toolchain/eglibc/Makefile.inc @@ -3,6 +3,6 @@ PKG_NAME:= eglibc PKG_VERSION:= 2.12.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 3668505801160785c2961df0a7ec192e PKG_SITES:= http://openadk.org/distfiles/ diff --git a/toolchain/eglibc/patches/eglibc-cross.patch b/toolchain/eglibc/patches/eglibc-cross.patch index 384a5c16b..6a7fb9e51 100644 --- a/toolchain/eglibc/patches/eglibc-cross.patch +++ b/toolchain/eglibc/patches/eglibc-cross.patch @@ -1,3 +1,5 @@ +* NOTE: This will still use a hardcoded “gcc” instead of HOSTCC + diff -Nur eglibc-2.12.orig/libc/sunrpc/proto.h eglibc-2.12/libc/sunrpc/proto.h --- eglibc-2.12.orig/libc/sunrpc/proto.h 2010-09-28 19:14:26.000000000 +0200 +++ eglibc-2.12/libc/sunrpc/proto.h 2010-09-29 14:05:15.000000000 +0200 |