summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-08-31 17:40:28 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-08-31 17:40:28 +0200
commitf0735b7474ec5f6096103cc510546699c823e673 (patch)
tree40777e11bf4b912e2386762b6f7d1fc39b76d21c
parent46b42b19c7dec20400c1c7621d09277bf3d92874 (diff)
timezone files no longer installed. why?
-rw-r--r--package/eglibc/Makefile32
-rw-r--r--toolchain/eglibc/Makefile4
-rw-r--r--toolchain/gcc/patches/4.6.3/siginfo.patch14
3 files changed, 31 insertions, 19 deletions
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index f14779f28..60dcb25d1 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -55,22 +55,22 @@ ifeq ($(ADK_LOCALES),y)
endif
${INSTALL_DIR} $(IDIR_EGLIBC)/lib $(IDIR_EGLIBC)/etc \
$(IDIR_EGLIBC)/usr/lib $(IDIR_EGLIBC)/usr/bin
- 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
+ #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
ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
$(CP) $(STAGING_TARGET_DIR)/lib/libssp.so* $(IDIR_EGLIBC)/lib
endif
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 2c40238ef..f5eae11cb 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -62,7 +62,7 @@ $(WRKBUILD)/.headers_configure:
$(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
(cd $(EGLIBC_BUILD_DIR_INITIAL); \
PATH='${TARGET_PATH}' \
- $(MAKE) install-headers install-bootstrap-headers=yes \
+ $(MAKE) install-headers install-bootstrap-headers=yes cross-compiling=yes \
);
touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-64.h
@@ -90,7 +90,7 @@ $(WRKBUILD)/.configured:
$(EGLIBC_BUILD_DIR_FINAL)/libc.so:
$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
- ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) all
+ ${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) cross-compiling=yes all
touch $@
$(WRKBUILD)/.installed: $(EGLIBC_BUILD_DIR_FINAL)/libc.so
diff --git a/toolchain/gcc/patches/4.6.3/siginfo.patch b/toolchain/gcc/patches/4.6.3/siginfo.patch
index 6d0b3e9b9..8dbf60415 100644
--- a/toolchain/gcc/patches/4.6.3/siginfo.patch
+++ b/toolchain/gcc/patches/4.6.3/siginfo.patch
@@ -1,6 +1,6 @@
diff -Nur gcc-4.6.3.orig/gcc/config/i386/linux-unwind.h gcc-4.6.3/gcc/config/i386/linux-unwind.h
--- gcc-4.6.3.orig/gcc/config/i386/linux-unwind.h 2011-01-03 21:52:22.000000000 +0100
-+++ gcc-4.6.3/gcc/config/i386/linux-unwind.h 2012-08-02 11:47:11.000000000 +0200
++++ gcc-4.6.3/gcc/config/i386/linux-unwind.h 2012-08-30 15:37:37.000000000 +0200
@@ -133,9 +133,9 @@
{
struct rt_sigframe {
@@ -13,3 +13,15 @@ diff -Nur gcc-4.6.3.orig/gcc/config/i386/linux-unwind.h gcc-4.6.3/gcc/config/i38
struct ucontext uc;
} *rt_ = context->cfa;
/* The void * cast is necessary to avoid an aliasing warning.
+diff -Nur gcc-4.6.3.orig/gcc/config/mips/linux-unwind.h gcc-4.6.3/gcc/config/mips/linux-unwind.h
+--- gcc-4.6.3.orig/gcc/config/mips/linux-unwind.h 2009-04-09 17:00:19.000000000 +0200
++++ gcc-4.6.3/gcc/config/mips/linux-unwind.h 2012-08-30 15:38:45.000000000 +0200
+@@ -75,7 +75,7 @@
+ struct rt_sigframe {
+ u_int32_t ass[4]; /* Argument save space for o32. */
+ u_int32_t trampoline[2];
+- struct siginfo info;
++ siginfo_t info;
+ _sig_ucontext_t uc;
+ } *rt_ = context->cfa;
+ sc = &rt_->uc.uc_mcontext;