Changeset 00520f6 in clfs-sysroot for patches/glibc-2.6-cross_hacks-1.patch
- Timestamp:
- Jul 22, 2007, 4:11:02 PM (18 years ago)
- Branches:
- master
- Children:
- 42d73f3
- Parents:
- 9568bd5
- File:
-
- 1 moved
-
patches/glibc-2.6-cross_hacks-1.patch (moved) (moved from patches/glibc-2.5-cross_hacks-2.patch ) (15 diffs)
Legend:
- Unmodified
- Added
- Removed
-
patches/glibc-2.6-cross_hacks-1.patch
r9568bd5 r00520f6 2 2 Date: 2006-11-26 3 3 Initial Package Version: 2.5 4 Rediffed against 2.6 by Joe Ciccone 4 5 Origin: Joe Ciccone 5 6 Upstream Status: Unknown … … 9 10 for creating the locale-archive. 10 11 11 -2 takes into account the possibility of CFLAGS being set for 12 the target. 13 14 diff -Naur glibc-2.5.orig/iconv/Makefile glibc-2.5/iconv/Makefile 15 --- glibc-2.5.orig/iconv/Makefile 2004-12-19 18:43:41.000000000 -0500 16 +++ glibc-2.5/iconv/Makefile 2006-11-26 17:26:05.000000000 -0500 12 diff -Naur glibc-2.6.orig/iconv/Makefile glibc-2.6/iconv/Makefile 13 --- glibc-2.6.orig/iconv/Makefile 2007-07-02 15:20:36.000000000 -0400 14 +++ glibc-2.6/iconv/Makefile 2007-07-02 15:28:24.000000000 -0400 17 15 @@ -56,6 +56,9 @@ 18 16 iconvconfig.h … … 33 31 ifneq ($(cross-compiling),yes) 34 32 xtests: test-iconvconfig 35 diff -Naur glibc-2. 5.orig/iconvdata/Makefile glibc-2.5/iconvdata/Makefile36 --- glibc-2. 5.orig/iconvdata/Makefile 2006-05-01 10:18:49.000000000 -040037 +++ glibc-2. 5/iconvdata/Makefile 2006-11-26 17:26:05.000000000 -050038 @@ -31 1,23 +311,25 @@33 diff -Naur glibc-2.6.orig/iconvdata/Makefile glibc-2.6/iconvdata/Makefile 34 --- glibc-2.6.orig/iconvdata/Makefile 2007-07-02 15:20:35.000000000 -0400 35 +++ glibc-2.6/iconvdata/Makefile 2007-07-02 15:28:24.000000000 -0400 36 @@ -312,23 +312,25 @@ 39 37 40 38 headers: $(addprefix $(objpfx), $(generated-modules:=.h)) … … 70 68 endif # build-shared = yes 71 69 72 diff -Naur glibc-2. 5.orig/include-native/bits/libc-tsd.h glibc-2.5/include-native/bits/libc-tsd.h73 --- glibc-2. 5.orig/include-native/bits/libc-tsd.h 1969-12-31 19:00:00.000000000 -050074 +++ glibc-2. 5/include-native/bits/libc-tsd.h 2006-11-26 17:26:05.000000000 -050070 diff -Naur glibc-2.6.orig/include-native/bits/libc-tsd.h glibc-2.6/include-native/bits/libc-tsd.h 71 --- glibc-2.6.orig/include-native/bits/libc-tsd.h 1969-12-31 19:00:00.000000000 -0500 72 +++ glibc-2.6/include-native/bits/libc-tsd.h 2007-07-02 15:28:24.000000000 -0400 75 73 @@ -0,0 +1,3 @@ 76 74 +#ifndef __libc_tsd_define 77 75 +#define __libc_tsd_define(A,B) 78 76 +#endif 79 diff -Naur glibc-2. 5.orig/include-native/config.h glibc-2.5/include-native/config.h80 --- glibc-2. 5.orig/include-native/config.h 1969-12-31 19:00:00.000000000 -050081 +++ glibc-2. 5/include-native/config.h 2006-11-26 17:26:05.000000000 -050077 diff -Naur glibc-2.6.orig/include-native/config.h glibc-2.6/include-native/config.h 78 --- glibc-2.6.orig/include-native/config.h 1969-12-31 19:00:00.000000000 -0500 79 +++ glibc-2.6/include-native/config.h 2007-07-02 15:28:24.000000000 -0400 82 80 @@ -0,0 +1 @@ 83 81 +/* Empty */ 84 diff -Naur glibc-2. 5.orig/include-native/gnu/stubs.h glibc-2.5/include-native/gnu/stubs.h85 --- glibc-2. 5.orig/include-native/gnu/stubs.h 1969-12-31 19:00:00.000000000 -050086 +++ glibc-2. 5/include-native/gnu/stubs.h 2006-11-26 17:26:05.000000000 -050082 diff -Naur glibc-2.6.orig/include-native/gnu/stubs.h glibc-2.6/include-native/gnu/stubs.h 83 --- glibc-2.6.orig/include-native/gnu/stubs.h 1969-12-31 19:00:00.000000000 -0500 84 +++ glibc-2.6/include-native/gnu/stubs.h 2007-07-02 15:28:24.000000000 -0400 87 85 @@ -0,0 +1 @@ 88 86 +/* Empty */ 89 diff -Naur glibc-2. 5.orig/include-native/intl/loadinfo.h glibc-2.5/include-native/intl/loadinfo.h90 --- glibc-2. 5.orig/include-native/intl/loadinfo.h 1969-12-31 19:00:00.000000000 -050091 +++ glibc-2. 5/include-native/intl/loadinfo.h 2006-11-26 17:26:05.000000000 -050087 diff -Naur glibc-2.6.orig/include-native/intl/loadinfo.h glibc-2.6/include-native/intl/loadinfo.h 88 --- glibc-2.6.orig/include-native/intl/loadinfo.h 1969-12-31 19:00:00.000000000 -0500 89 +++ glibc-2.6/include-native/intl/loadinfo.h 2007-07-02 15:28:24.000000000 -0400 92 90 @@ -0,0 +1,4 @@ 93 91 +#ifndef LOADINFO_H … … 95 93 +struct loaded_l10nfile; 96 94 +#endif 97 diff -Naur glibc-2. 5.orig/include-native/libintl.h glibc-2.5/include-native/libintl.h98 --- glibc-2. 5.orig/include-native/libintl.h 1969-12-31 19:00:00.000000000 -050099 +++ glibc-2. 5/include-native/libintl.h 2006-11-26 17:26:05.000000000 -050095 diff -Naur glibc-2.6.orig/include-native/libintl.h glibc-2.6/include-native/libintl.h 96 --- glibc-2.6.orig/include-native/libintl.h 1969-12-31 19:00:00.000000000 -0500 97 +++ glibc-2.6/include-native/libintl.h 2007-07-02 15:28:24.000000000 -0400 100 98 @@ -0,0 +1,13 @@ 101 99 +#include_next <libintl.h> … … 112 110 +#define _libc_intl_domainname "libc" 113 111 +#endif 114 diff -Naur glibc-2. 5.orig/include-native/symbol-hacks.h glibc-2.5/include-native/symbol-hacks.h115 --- glibc-2. 5.orig/include-native/symbol-hacks.h 1969-12-31 19:00:00.000000000 -0500116 +++ glibc-2. 5/include-native/symbol-hacks.h 2006-11-26 17:26:05.000000000 -0500112 diff -Naur glibc-2.6.orig/include-native/symbol-hacks.h glibc-2.6/include-native/symbol-hacks.h 113 --- glibc-2.6.orig/include-native/symbol-hacks.h 1969-12-31 19:00:00.000000000 -0500 114 +++ glibc-2.6/include-native/symbol-hacks.h 2007-07-02 15:28:24.000000000 -0400 117 115 @@ -0,0 +1 @@ 118 116 +/* Empty */ 119 diff -Naur glibc-2. 5.orig/include-native/tls.h glibc-2.5/include-native/tls.h120 --- glibc-2. 5.orig/include-native/tls.h 1969-12-31 19:00:00.000000000 -0500121 +++ glibc-2. 5/include-native/tls.h 2006-11-26 17:26:05.000000000 -0500117 diff -Naur glibc-2.6.orig/include-native/tls.h glibc-2.6/include-native/tls.h 118 --- glibc-2.6.orig/include-native/tls.h 1969-12-31 19:00:00.000000000 -0500 119 +++ glibc-2.6/include-native/tls.h 2007-07-02 15:28:24.000000000 -0400 122 120 @@ -0,0 +1,11 @@ 123 121 +#ifndef _include_tls_h … … 132 130 + 133 131 +#endif 134 diff -Naur glibc-2. 5.orig/locale/Makefile glibc-2.5/locale/Makefile135 --- glibc-2. 5.orig/locale/Makefile 2005-12-20 01:58:41.000000000 -0500136 +++ glibc-2. 5/locale/Makefile 2006-11-26 17:26:05.000000000 -0500132 diff -Naur glibc-2.6.orig/locale/Makefile glibc-2.6/locale/Makefile 133 --- glibc-2.6.orig/locale/Makefile 2007-07-02 15:20:37.000000000 -0400 134 +++ glibc-2.6/locale/Makefile 2007-07-02 15:28:24.000000000 -0400 137 135 @@ -44,6 +44,9 @@ 138 136 aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ … … 158 156 $(PERL) gen-translit.pl < $< > $@.tmp 159 157 mv -f $@.tmp $@ 160 diff -Naur glibc-2. 5.orig/localedata/Makefile glibc-2.5/localedata/Makefile161 --- glibc-2. 5.orig/localedata/Makefile 2006-04-26 01:14:03.000000000 -0400162 +++ glibc-2. 5/localedata/Makefile 2006-11-26 17:26:05.000000000 -0500158 diff -Naur glibc-2.6.orig/localedata/Makefile glibc-2.6/localedata/Makefile 159 --- glibc-2.6.orig/localedata/Makefile 2007-07-02 15:20:34.000000000 -0400 160 +++ glibc-2.6/localedata/Makefile 2007-07-02 15:28:24.000000000 -0400 163 161 @@ -206,8 +206,13 @@ 164 162 INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) … … 175 173 176 174 install-locales-dir: 177 diff -Naur glibc-2. 5.orig/Makeconfig glibc-2.5/Makeconfig178 --- glibc-2. 5.orig/Makeconfig 2006-07-10 17:42:27.000000000 -0400179 +++ glibc-2. 5/Makeconfig 2006-11-26 18:24:54.000000000 -0500180 @@ -44 7,6 +447,13 @@175 diff -Naur glibc-2.6.orig/Makeconfig glibc-2.6/Makeconfig 176 --- glibc-2.6.orig/Makeconfig 2007-07-02 15:20:36.000000000 -0400 177 +++ glibc-2.6/Makeconfig 2007-07-02 15:32:37.000000000 -0400 178 @@ -445,6 +445,13 @@ 181 179 $(common-objpfx)libc% $(+postinit),$^) \ 182 180 $(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit) … … 192 190 ifndef +link-bounded 193 191 +link-bounded = $(CC) -nostdlib -nostartfiles -static -fbounded-pointers -o $@ \ 194 @@ -6 60,6 +667,8 @@192 @@ -658,6 +665,8 @@ 195 193 $(+sysdep-includes) $(includes) \ 196 194 $(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes) … … 201 199 # of many little headers in the include directory. 202 200 libio-include = -I$(..)libio 203 @@ -67 4,10 +683,15 @@201 @@ -672,10 +681,15 @@ 204 202 $(foreach lib,$(libof-$(basename $(@F))) \ 205 203 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \ 206 204 $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F))) 207 205 +CPPFLAGS-native = -D_GNU_SOURCE $($(subdir)-CPPFLAGS) $(+includes-native) $(defines) \ 208 + 209 + 210 override CFLAGS = -std=gnu99 \206 + $(CPPFLAGS-$(suffix $@)) -include $(..)include/libc-symbols.h \ 207 + $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F))) 208 override CFLAGS = -std=gnu99 $(gnu89-inline-CFLAGS) \ 211 209 $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \ 212 210 $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \ 213 211 $(CFLAGS-$(@F)) 214 212 +override CFLAGS-native = -std=gnu99 $(default_cflags) $(+gccwarn-c) \ 215 + 213 + $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F)) 216 214 override CXXFLAGS = $(c++-sysincludes) \ 217 215 $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \ 218 216 $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F)) 219 diff -Naur glibc-2. 5.orig/Makerules glibc-2.5/Makerules220 --- glibc-2. 5.orig/Makerules 2006-09-04 22:02:13.000000000 -0400221 +++ glibc-2. 5/Makerules 2006-11-26 18:15:25.000000000 -0500217 diff -Naur glibc-2.6.orig/Makerules glibc-2.6/Makerules 218 --- glibc-2.6.orig/Makerules 2007-07-02 15:20:36.000000000 -0400 219 +++ glibc-2.6/Makerules 2007-07-02 15:28:24.000000000 -0400 222 220 @@ -292,6 +292,9 @@ 223 221 object-suffixes-left := $(all-object-suffixes) … … 257 255 258 256 # Command to compile $< in $(common-objdir) using the native libraries. 259 diff -Naur glibc-2. 5.orig/malloc/Makefile glibc-2.5/malloc/Makefile260 --- glibc-2. 5.orig/malloc/Makefile 2006-05-19 12:42:00.000000000 -0400261 +++ glibc-2. 5/malloc/Makefile 2006-11-26 17:26:05.000000000 -0500257 diff -Naur glibc-2.6.orig/malloc/Makefile glibc-2.6/malloc/Makefile 258 --- glibc-2.6.orig/malloc/Makefile 2007-07-02 15:20:36.000000000 -0400 259 +++ glibc-2.6/malloc/Makefile 2007-07-02 15:28:24.000000000 -0400 262 260 @@ -73,10 +73,6 @@ 263 261 endif … … 279 277 # Another goal which can be used to override the configure decision. 280 278 .PHONY: do-memusagestat 281 diff -Naur glibc-2. 5.orig/Rules glibc-2.5/Rules282 --- glibc-2. 5.orig/Rules 2006-02-28 02:05:48.000000000 -0500283 +++ glibc-2. 5/Rules 2006-11-26 17:26:05.000000000 -0500279 diff -Naur glibc-2.6.orig/Rules glibc-2.6/Rules 280 --- glibc-2.6.orig/Rules 2007-07-02 15:20:35.000000000 -0400 281 +++ glibc-2.6/Rules 2007-07-02 15:28:24.000000000 -0400 284 282 @@ -87,7 +87,7 @@ 285 283 … … 315 313 binaries-bounded = $(addsuffix -bp,$(tests) $(xtests) $(test-srcs)) 316 314 $(addprefix $(objpfx),$(binaries-bounded)): %-bp: %.ob \ 317 diff -Naur glibc-2. 5.orig/sunrpc/Makefile glibc-2.5/sunrpc/Makefile318 --- glibc-2. 5.orig/sunrpc/Makefile 2005-06-26 14:24:19.000000000 -0400319 +++ glibc-2. 5/sunrpc/Makefile 2006-11-26 17:26:05.000000000 -0500315 diff -Naur glibc-2.6.orig/sunrpc/Makefile glibc-2.6/sunrpc/Makefile 316 --- glibc-2.6.orig/sunrpc/Makefile 2007-07-02 15:20:36.000000000 -0400 317 +++ glibc-2.6/sunrpc/Makefile 2007-07-02 15:28:24.000000000 -0400 320 318 @@ -70,6 +70,9 @@ 321 319 clnt_unix svc_unix create_xid xdr_intXX_t … … 389 387 $(rpcgen-cmd) -c $< -o ${@:stmp=T} 390 388 $(move-if-change) $(@:stmp=T) $(@:stmp=c) 391 diff -Naur glibc-2. 5.orig/timezone/Makefile glibc-2.5/timezone/Makefile392 --- glibc-2. 5.orig/timezone/Makefile 2005-04-15 16:09:08.000000000 -0400393 +++ glibc-2. 5/timezone/Makefile 2006-11-26 17:26:05.000000000 -0500389 diff -Naur glibc-2.6.orig/timezone/Makefile glibc-2.6/timezone/Makefile 390 --- glibc-2.6.orig/timezone/Makefile 2007-07-02 15:20:36.000000000 -0400 391 +++ glibc-2.6/timezone/Makefile 2007-07-02 15:28:24.000000000 -0400 394 392 @@ -28,6 +28,9 @@ 395 393 extra-objs := scheck.o ialloc.o
Note:
See TracChangeset
for help on using the changeset viewer.
