From 624a0b9597bb02103278c68665784e1fcfc3832e Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 16 Dec 2009 15:22:58 +0000 Subject: [PATCH] glibc: Updated glibc-2.10.1-cross_hacks-2.patch. --- glibc/.md5sum | 2 +- glibc/glibc-2.10.1-cross_hacks-2.patch | 109 +++++++++++++------------ 2 files changed, 56 insertions(+), 55 deletions(-) diff --git a/glibc/.md5sum b/glibc/.md5sum index 8994659..8528b2c 100644 --- a/glibc/.md5sum +++ b/glibc/.md5sum @@ -1,4 +1,4 @@ -e23330017aa00167adb2c25f0d710c6d glibc-2.10.1-cross_hacks-2.patch +259adb6b9e9ba04805142081c5b7dba1 glibc-2.10.1-cross_hacks-2.patch ee71dedf724dc775e4efec9b823ed3be glibc-2.10.1.tar.bz2 816b2d48a95ddc23b27fea03a1996443 glibc-ports-2.10.1.tar.bz2 96156bec8e05de67384dc93e72bdc313 host.conf diff --git a/glibc/glibc-2.10.1-cross_hacks-2.patch b/glibc/glibc-2.10.1-cross_hacks-2.patch index fba564f..cd194fd 100644 --- a/glibc/glibc-2.10.1-cross_hacks-2.patch +++ b/glibc/glibc-2.10.1-cross_hacks-2.patch @@ -4,6 +4,7 @@ Initial Package Version: 2.5 Rediffed against 2.6 by Joe Ciccone Rediffed against 2.8 by Joe Ciccone on 2009-01-03 Rediffed against 2.9 by Joe Ciccone on 2009-03-15 + Rediffed against 2.10.1 by crux-arm@mikeux.dyndns.org 2009-12-16 Origin: Joe Ciccone Upstream Status: Unknown Description: Adds native compile support to the build system then uses that @@ -11,9 +12,9 @@ Description: Adds native compile support to the build system then uses that rpcgen-native, for building librpcsvc.a, and localedef-native, for creating the locale-archive. -diff -Naur glibc-2.9.orig/iconv/Makefile glibc-2.9/iconv/Makefile ---- glibc-2.9.orig/iconv/Makefile 2007-07-24 23:41:17.000000000 -0400 -+++ glibc-2.9/iconv/Makefile 2009-03-15 19:22:15.732837951 -0400 +diff -Naur glibc-2.10.1.orig/iconv/Makefile glibc-2.10.1/iconv/Makefile +--- glibc-2.10.1.orig/iconv/Makefile 2007-07-24 23:41:17.000000000 -0400 ++++ glibc-2.10.1/iconv/Makefile 2009-03-15 19:22:15.732837951 -0400 @@ -57,6 +57,9 @@ iconvconfig.h @@ -32,9 +33,9 @@ diff -Naur glibc-2.9.orig/iconv/Makefile glibc-2.9/iconv/Makefile ifneq ($(cross-compiling),yes) xtests: test-iconvconfig -diff -Naur glibc-2.9.orig/iconvdata/Makefile glibc-2.9/iconvdata/Makefile ---- glibc-2.9.orig/iconvdata/Makefile 2008-05-14 21:54:31.000000000 -0400 -+++ glibc-2.9/iconvdata/Makefile 2009-03-15 19:22:15.753163155 -0400 +diff -Naur glibc-2.10.1.orig/iconvdata/Makefile glibc-2.10.1/iconvdata/Makefile +--- glibc-2.10.1.orig/iconvdata/Makefile 2008-05-14 21:54:31.000000000 -0400 ++++ glibc-2.10.1/iconvdata/Makefile 2009-03-15 19:22:15.753163155 -0400 @@ -320,23 +320,25 @@ headers: $(addprefix $(objpfx), $(generated-modules:=.h)) @@ -69,34 +70,34 @@ diff -Naur glibc-2.9.orig/iconvdata/Makefile glibc-2.9/iconvdata/Makefile endif # build-shared = yes -diff -Naur glibc-2.9.orig/include-native/bits/libc-tsd.h glibc-2.9/include-native/bits/libc-tsd.h ---- glibc-2.9.orig/include-native/bits/libc-tsd.h 1969-12-31 19:00:00.000000000 -0500 -+++ glibc-2.9/include-native/bits/libc-tsd.h 2009-03-15 19:22:15.788787576 -0400 +diff -Naur glibc-2.10.1.orig/include-native/bits/libc-tsd.h glibc-2.10.1/include-native/bits/libc-tsd.h +--- glibc-2.10.1.orig/include-native/bits/libc-tsd.h 1969-12-31 19:00:00.000000000 -0500 ++++ glibc-2.10.1/include-native/bits/libc-tsd.h 2009-03-15 19:22:15.788787576 -0400 @@ -0,0 +1,3 @@ +#ifndef __libc_tsd_define +#define __libc_tsd_define(A,B,C) +#endif -diff -Naur glibc-2.9.orig/include-native/config.h glibc-2.9/include-native/config.h ---- glibc-2.9.orig/include-native/config.h 1969-12-31 19:00:00.000000000 -0500 -+++ glibc-2.9/include-native/config.h 2009-03-15 19:22:15.809829790 -0400 +diff -Naur glibc-2.10.1.orig/include-native/config.h glibc-2.10.1/include-native/config.h +--- glibc-2.10.1.orig/include-native/config.h 1969-12-31 19:00:00.000000000 -0500 ++++ glibc-2.10.1/include-native/config.h 2009-03-15 19:22:15.809829790 -0400 @@ -0,0 +1 @@ +/* Empty */ -diff -Naur glibc-2.9.orig/include-native/gnu/stubs.h glibc-2.9/include-native/gnu/stubs.h ---- glibc-2.9.orig/include-native/gnu/stubs.h 1969-12-31 19:00:00.000000000 -0500 -+++ glibc-2.9/include-native/gnu/stubs.h 2009-03-15 19:22:15.809829790 -0400 +diff -Naur glibc-2.10.1.orig/include-native/gnu/stubs.h glibc-2.10.1/include-native/gnu/stubs.h +--- glibc-2.10.1.orig/include-native/gnu/stubs.h 1969-12-31 19:00:00.000000000 -0500 ++++ glibc-2.10.1/include-native/gnu/stubs.h 2009-03-15 19:22:15.809829790 -0400 @@ -0,0 +1 @@ +/* Empty */ -diff -Naur glibc-2.9.orig/include-native/intl/loadinfo.h glibc-2.9/include-native/intl/loadinfo.h ---- glibc-2.9.orig/include-native/intl/loadinfo.h 1969-12-31 19:00:00.000000000 -0500 -+++ glibc-2.9/include-native/intl/loadinfo.h 2009-03-15 19:22:15.809829790 -0400 +diff -Naur glibc-2.10.1.orig/include-native/intl/loadinfo.h glibc-2.10.1/include-native/intl/loadinfo.h +--- glibc-2.10.1.orig/include-native/intl/loadinfo.h 1969-12-31 19:00:00.000000000 -0500 ++++ glibc-2.10.1/include-native/intl/loadinfo.h 2009-03-15 19:22:15.809829790 -0400 @@ -0,0 +1,4 @@ +#ifndef LOADINFO_H +#define LOADINFO_H +struct loaded_l10nfile; +#endif -diff -Naur glibc-2.9.orig/include-native/libintl.h glibc-2.9/include-native/libintl.h ---- glibc-2.9.orig/include-native/libintl.h 1969-12-31 19:00:00.000000000 -0500 -+++ glibc-2.9/include-native/libintl.h 2009-03-15 19:22:15.838789367 -0400 +diff -Naur glibc-2.10.1.orig/include-native/libintl.h glibc-2.10.1/include-native/libintl.h +--- glibc-2.10.1.orig/include-native/libintl.h 1969-12-31 19:00:00.000000000 -0500 ++++ glibc-2.10.1/include-native/libintl.h 2009-03-15 19:22:15.838789367 -0400 @@ -0,0 +1,13 @@ +#include_next + @@ -111,14 +112,14 @@ diff -Naur glibc-2.9.orig/include-native/libintl.h glibc-2.9/include-native/libi +#ifndef _libc_intl_domainname +#define _libc_intl_domainname "libc" +#endif -diff -Naur glibc-2.9.orig/include-native/symbol-hacks.h glibc-2.9/include-native/symbol-hacks.h ---- glibc-2.9.orig/include-native/symbol-hacks.h 1969-12-31 19:00:00.000000000 -0500 -+++ glibc-2.9/include-native/symbol-hacks.h 2009-03-15 19:22:15.838789367 -0400 +diff -Naur glibc-2.10.1.orig/include-native/symbol-hacks.h glibc-2.10.1/include-native/symbol-hacks.h +--- glibc-2.10.1.orig/include-native/symbol-hacks.h 1969-12-31 19:00:00.000000000 -0500 ++++ glibc-2.10.1/include-native/symbol-hacks.h 2009-03-15 19:22:15.838789367 -0400 @@ -0,0 +1 @@ +/* Empty */ -diff -Naur glibc-2.9.orig/include-native/tls.h glibc-2.9/include-native/tls.h ---- glibc-2.9.orig/include-native/tls.h 1969-12-31 19:00:00.000000000 -0500 -+++ glibc-2.9/include-native/tls.h 2009-03-15 19:22:15.838789367 -0400 +diff -Naur glibc-2.10.1.orig/include-native/tls.h glibc-2.10.1/include-native/tls.h +--- glibc-2.10.1.orig/include-native/tls.h 1969-12-31 19:00:00.000000000 -0500 ++++ glibc-2.10.1/include-native/tls.h 2009-03-15 19:22:15.838789367 -0400 @@ -0,0 +1,11 @@ +#ifndef _include_tls_h +#define _include_tls_h 1 @@ -131,9 +132,9 @@ diff -Naur glibc-2.9.orig/include-native/tls.h glibc-2.9/include-native/tls.h +#endif + +#endif -diff -Naur glibc-2.9.orig/locale/Makefile glibc-2.9/locale/Makefile ---- glibc-2.9.orig/locale/Makefile 2005-12-20 01:58:41.000000000 -0500 -+++ glibc-2.9/locale/Makefile 2009-03-15 19:22:15.838789367 -0400 +diff -Naur glibc-2.10.1.orig/locale/Makefile glibc-2.10.1/locale/Makefile +--- glibc-2.10.1.orig/locale/Makefile 2005-12-20 01:58:41.000000000 -0500 ++++ glibc-2.10.1/locale/Makefile 2009-03-15 19:22:15.838789367 -0400 @@ -44,6 +44,9 @@ aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ xlocale localename global-locale coll-lookup @@ -157,9 +158,9 @@ diff -Naur glibc-2.9.orig/locale/Makefile glibc-2.9/locale/Makefile C-translit.h: C-translit.h.in gen-translit.pl $(PERL) gen-translit.pl < $< > $@.tmp mv -f $@.tmp $@ -diff -Naur glibc-2.9.orig/localedata/Makefile glibc-2.9/localedata/Makefile ---- glibc-2.9.orig/localedata/Makefile 2008-11-27 19:05:08.000000000 -0500 -+++ glibc-2.9/localedata/Makefile 2009-03-15 19:22:15.939718625 -0400 +diff -Naur glibc-2.10.1.orig/localedata/Makefile glibc-2.10.1/localedata/Makefile +--- glibc-2.10.1.orig/localedata/Makefile 2008-11-27 19:05:08.000000000 -0500 ++++ glibc-2.10.1/localedata/Makefile 2009-03-15 19:22:15.939718625 -0400 @@ -208,8 +208,13 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) @@ -174,9 +175,9 @@ diff -Naur glibc-2.9.orig/localedata/Makefile glibc-2.9/localedata/Makefile install-locales: $(INSTALL-SUPPORTED-LOCALES) install-locales-dir: -diff -Naur glibc-2.9.orig/localedata/Makefile.orig glibc-2.9/localedata/Makefile.orig ---- glibc-2.9.orig/localedata/Makefile.orig 1969-12-31 19:00:00.000000000 -0500 -+++ glibc-2.9/localedata/Makefile.orig 2008-11-27 19:05:08.000000000 -0500 +diff -Naur glibc-2.10.1.orig/localedata/Makefile.orig glibc-2.10.1/localedata/Makefile.orig +--- glibc-2.10.1.orig/localedata/Makefile.orig 1969-12-31 19:00:00.000000000 -0500 ++++ glibc-2.10.1/localedata/Makefile.orig 2008-11-27 19:05:08.000000000 -0500 @@ -0,0 +1,300 @@ +# Copyright (C) 1996-2003, 2005, 2007, 2008 Free Software Foundation, Inc. +# This file is part of the GNU C Library. @@ -478,9 +479,9 @@ diff -Naur glibc-2.9.orig/localedata/Makefile.orig glibc-2.9/localedata/Makefile + LOCPATH=$(common-objpfx)localedata +$(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out + $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@ -diff -Naur glibc-2.9.orig/Makeconfig glibc-2.9/Makeconfig ---- glibc-2.9.orig/Makeconfig 2008-08-18 05:42:17.000000000 -0400 -+++ glibc-2.9/Makeconfig 2009-03-15 19:22:15.939718625 -0400 +diff -Naur glibc-2.10.1.orig/Makeconfig glibc-2.10.1/Makeconfig +--- glibc-2.10.1.orig/Makeconfig 2008-08-18 05:42:17.000000000 -0400 ++++ glibc-2.10.1/Makeconfig 2009-03-15 19:22:15.939718625 -0400 @@ -446,6 +446,13 @@ $(common-objpfx)libc% $(+postinit),$^) \ $(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit) @@ -520,9 +521,9 @@ diff -Naur glibc-2.9.orig/Makeconfig glibc-2.9/Makeconfig override CXXFLAGS = $(c++-sysincludes) \ $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \ $(CFLAGS-$(suffix $@)) $(CFLAGS-$(