From ee4b6c9485e3e2f2fb46bab921ae452fe565d869 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 6 Jan 2011 19:49:45 +0100 Subject: install empty header stub --- package/eglibc/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/eglibc/Makefile') diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 27e271f44..0f15c3e10 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -89,6 +89,7 @@ eglibc-dev-install: PATH='${TARGET_PATH}' \ $(MAKE) -C $(WRKBUILD) \ install-headers install-bootstrap-headers=yes + @touch $(IDIR_EGLIBC_DEV)/usr/include/gnu/stubs.h @find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \; @find $(IDIR_EGLIBC_DEV) -name ..install.cmd -exec rm {} \; # conflicts with libiconv -- cgit v1.2.3 From 5a65c76bc3d72ea9f275a3c474d5e308cf367a82 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 6 Jan 2011 23:18:06 +0100 Subject: remove obsolete SUB_INSTALL stuff. --- package/eglibc/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'package/eglibc/Makefile') diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 0f15c3e10..50c75b1f2 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -20,10 +20,6 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -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) \ @@ -51,7 +47,7 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ libc_cv_slibdir="/lib" # compile nothing, eglibc is already build in toolchain directory -do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +do-install: ${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \ $(IDIR_EGLIBC)/usr/lib test -z $(ADK_RUNTIME_TIMEZONE) || \ -- cgit v1.2.3 From a0ea7c09e9b28bf6571363a2c3542fb03f7b34ae Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 7 Jan 2011 17:04:56 +0100 Subject: add varios patches... eglibc should install nsswitch.conf and others. add -fhonour-copts to TARGET_CFLAGS. --- package/eglibc/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'package/eglibc/Makefile') diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 50c75b1f2..27dc871bf 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -54,10 +54,13 @@ do-install: $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ $(IDIR_EGLIBC)/etc/localtime $(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/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_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib/; \ done + ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_EGLIBC}/etc/ + ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/nscd.conf ${IDIR_EGLIBC}/etc/ + ${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/nsswitch.conf ${IDIR_EGLIBC}/etc/ eglibc-dev-install: ${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib $(IDIR_EGLIBC_DEV)/usr/lib -- cgit v1.2.3 From 1a4fa44b145ef3eaaf96e47adfe8957d56c9b280 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 7 Jan 2011 23:33:37 +0100 Subject: add missing stuff from tg@ --- package/eglibc/Makefile | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'package/eglibc/Makefile') diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 27dc871bf..e82e3b707 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -49,10 +49,23 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ # compile nothing, eglibc is already build in toolchain directory do-install: ${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \ - $(IDIR_EGLIBC)/usr/lib - test -z $(ADK_RUNTIME_TIMEZONE) || \ - $(CP) /usr/share/zoneinfo/$(ADK_RUNTIME_TIMEZONE) \ - $(IDIR_EGLIBC)/etc/localtime + $(IDIR_EGLIBC)/usr/lib + cd ${STAGING_TARGET_DIR} && for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ + test -s usr/share/zoneinfo/"$$f" || continue; \ + echo usr/share/zoneinfo/"$$f" | \ + ${TOOLS_DIR}/cpio -pdu ${IDIR_EGLIBC}/; \ + done + tz=; cd ${IDIR_EGLIBC}/usr/share/zoneinfo || exit 1; \ + for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \ + test -s "$$f" || continue; \ + tz=$$f; \ + done; if test x"$$tz" = x""; then \ + echo >&2 Error during timezone installation; \ + exit 1; \ + else \ + ln -sf "../usr/share/zoneinfo/$$tz" \ + ${IDIR_EGLIBC}/etc/localtime; \ + fi $(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/lib/ -for file in libc libcrypt libdl libm libresolv librt libutil libnss_dns libnss_files; do \ $(CP) $(STAGING_TARGET_DIR)/lib/$$file.so* $(IDIR_EGLIBC)/lib/; \ -- cgit v1.2.3 From a217fc80b29080dae963bb15051df023de36ce39 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Jan 2011 10:59:12 +0100 Subject: add LTO support to toolchain settings. Cleanup SYSROOT mess. - just use on sysroot directory for toolchain. - add missing patches from previos commit. (rpath/cflags cleanup) --- package/eglibc/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'package/eglibc/Makefile') diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index e82e3b707..844b49876 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -20,10 +20,9 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -EGLIBC_CONFOPTS:= \ - --build=$(GNU_HOST_NAME) \ +EGLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ - --with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \ + --with-headers=$(STAGING_TARGET_DIR)/usr/include \ --disable-nls \ --without-cvs \ --disable-profile \ -- cgit v1.2.3