From 1a4fa44b145ef3eaaf96e47adfe8957d56c9b280 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
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')

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