| [32edd3a] | 1 | Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org> | 
|---|
| [ffd1587] | 2 | Date: 2006-11-26 | 
|---|
| [32edd3a] | 3 | Initial Package Version: 2.5 | 
|---|
|  | 4 | Origin: Joe Ciccone | 
|---|
| [ffd1587] | 5 | Upstream Status: Unknown | 
|---|
| [32edd3a] | 6 | Description: Adds native compile support to the build system then uses that | 
|---|
|  | 7 | support to build zic-native, for installing timezone info, | 
|---|
|  | 8 | rpcgen-native, for building librpcsvc.a, and localedef-native, | 
|---|
|  | 9 | for creating the locale-archive. | 
|---|
|  | 10 |  | 
|---|
| [ffd1587] | 11 | -2 takes into account the possibility of CFLAGS being set for | 
|---|
|  | 12 | the target. | 
|---|
|  | 13 |  | 
|---|
| [32edd3a] | 14 | diff -Naur glibc-2.5.orig/iconv/Makefile glibc-2.5/iconv/Makefile | 
|---|
| [ffd1587] | 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 | 
|---|
| [32edd3a] | 17 | @@ -56,6 +56,9 @@ | 
|---|
|  | 18 | iconvconfig.h | 
|---|
|  | 19 |  | 
|---|
|  | 20 | others         = iconv_prog iconvconfig | 
|---|
|  | 21 | +ifneq ($(cross-compiling),no) | 
|---|
|  | 22 | +others-native  = iconvconfig-native | 
|---|
|  | 23 | +endif | 
|---|
|  | 24 | install-others = $(inst_bindir)/iconv | 
|---|
|  | 25 | install-sbin   = iconvconfig | 
|---|
|  | 26 |  | 
|---|
|  | 27 | @@ -78,6 +81,7 @@ | 
|---|
|  | 28 |  | 
|---|
|  | 29 | $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o) | 
|---|
|  | 30 | $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o) | 
|---|
|  | 31 | +$(objpfx)iconvconfig-native: $(iconvconfig-modules:%=$(objpfx)%-native.o) | 
|---|
|  | 32 |  | 
|---|
|  | 33 | ifneq ($(cross-compiling),yes) | 
|---|
|  | 34 | xtests: test-iconvconfig | 
|---|
|  | 35 | diff -Naur glibc-2.5.orig/iconvdata/Makefile glibc-2.5/iconvdata/Makefile | 
|---|
| [ffd1587] | 36 | --- glibc-2.5.orig/iconvdata/Makefile   2006-05-01 10:18:49.000000000 -0400 | 
|---|
|  | 37 | +++ glibc-2.5/iconvdata/Makefile        2006-11-26 17:26:05.000000000 -0500 | 
|---|
| [32edd3a] | 38 | @@ -311,23 +311,25 @@ | 
|---|
|  | 39 |  | 
|---|
|  | 40 | headers: $(addprefix $(objpfx), $(generated-modules:=.h)) | 
|---|
|  | 41 |  | 
|---|
|  | 42 | +ifeq ($(cross-compiling),no) | 
|---|
|  | 43 | +iconvconfig-cmd = LC_ALL=C LANGUAGE=C \ | 
|---|
|  | 44 | +  $(common-objpfx)elf/ld.so --library-path $(rpath-link) \ | 
|---|
|  | 45 | +  $(common-objpfx)iconv/iconvconfig | 
|---|
|  | 46 | +else | 
|---|
|  | 47 | +iconvconfig-cmd = LC_ALL=C LANGUAGE=C \ | 
|---|
|  | 48 | +  $(common-objpfx)iconv/iconvconfig-native | 
|---|
|  | 49 | +endif | 
|---|
|  | 50 | + | 
|---|
|  | 51 | $(addprefix $(inst_gconvdir)/, $(modules.so)): \ | 
|---|
|  | 52 | $(inst_gconvdir)/%: $(objpfx)% $(+force) | 
|---|
|  | 53 | $(do-install-program) | 
|---|
|  | 54 | $(inst_gconvdir)/gconv-modules: gconv-modules $(+force) | 
|---|
|  | 55 | $(do-install) | 
|---|
|  | 56 | -ifeq (no,$(cross-compiling)) | 
|---|
|  | 57 | # Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary | 
|---|
|  | 58 | # if this libc has more gconv modules than the previously installed one. | 
|---|
|  | 59 | if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \ | 
|---|
|  | 60 | -          LC_ALL=C LANGUAGE=C \ | 
|---|
|  | 61 | -          $(common-objpfx)elf/ld.so --library-path $(rpath-link) \ | 
|---|
|  | 62 | -          $(common-objpfx)iconv/iconvconfig \ | 
|---|
|  | 63 | -            $(addprefix --prefix=,$(install_root)); \ | 
|---|
|  | 64 | +          $(iconvconfig-cmd) $(addprefix --prefix=,$(install_root)); \ | 
|---|
|  | 65 | fi | 
|---|
|  | 66 | -else | 
|---|
|  | 67 | -       @echo '*@*@*@ You should recreate $(inst_gconvdir)/gconv-modules.cache' | 
|---|
|  | 68 | -endif | 
|---|
|  | 69 |  | 
|---|
|  | 70 | endif # build-shared = yes | 
|---|
|  | 71 |  | 
|---|
|  | 72 | diff -Naur glibc-2.5.orig/include-native/bits/libc-tsd.h glibc-2.5/include-native/bits/libc-tsd.h | 
|---|
|  | 73 | --- glibc-2.5.orig/include-native/bits/libc-tsd.h       1969-12-31 19:00:00.000000000 -0500 | 
|---|
| [ffd1587] | 74 | +++ glibc-2.5/include-native/bits/libc-tsd.h    2006-11-26 17:26:05.000000000 -0500 | 
|---|
| [32edd3a] | 75 | @@ -0,0 +1,3 @@ | 
|---|
|  | 76 | +#ifndef __libc_tsd_define | 
|---|
|  | 77 | +#define __libc_tsd_define(A,B) | 
|---|
|  | 78 | +#endif | 
|---|
|  | 79 | diff -Naur glibc-2.5.orig/include-native/config.h glibc-2.5/include-native/config.h | 
|---|
|  | 80 | --- glibc-2.5.orig/include-native/config.h      1969-12-31 19:00:00.000000000 -0500 | 
|---|
| [ffd1587] | 81 | +++ glibc-2.5/include-native/config.h   2006-11-26 17:26:05.000000000 -0500 | 
|---|
| [32edd3a] | 82 | @@ -0,0 +1 @@ | 
|---|
|  | 83 | +/* Empty */ | 
|---|
|  | 84 | diff -Naur glibc-2.5.orig/include-native/gnu/stubs.h glibc-2.5/include-native/gnu/stubs.h | 
|---|
|  | 85 | --- glibc-2.5.orig/include-native/gnu/stubs.h   1969-12-31 19:00:00.000000000 -0500 | 
|---|
| [ffd1587] | 86 | +++ glibc-2.5/include-native/gnu/stubs.h        2006-11-26 17:26:05.000000000 -0500 | 
|---|
| [32edd3a] | 87 | @@ -0,0 +1 @@ | 
|---|
|  | 88 | +/* Empty */ | 
|---|
|  | 89 | diff -Naur glibc-2.5.orig/include-native/intl/loadinfo.h glibc-2.5/include-native/intl/loadinfo.h | 
|---|
|  | 90 | --- glibc-2.5.orig/include-native/intl/loadinfo.h       1969-12-31 19:00:00.000000000 -0500 | 
|---|
| [ffd1587] | 91 | +++ glibc-2.5/include-native/intl/loadinfo.h    2006-11-26 17:26:05.000000000 -0500 | 
|---|
| [32edd3a] | 92 | @@ -0,0 +1,4 @@ | 
|---|
|  | 93 | +#ifndef LOADINFO_H | 
|---|
|  | 94 | +#define LOADINFO_H | 
|---|
|  | 95 | +struct loaded_l10nfile; | 
|---|
|  | 96 | +#endif | 
|---|
|  | 97 | diff -Naur glibc-2.5.orig/include-native/libintl.h glibc-2.5/include-native/libintl.h | 
|---|
|  | 98 | --- glibc-2.5.orig/include-native/libintl.h     1969-12-31 19:00:00.000000000 -0500 | 
|---|
| [ffd1587] | 99 | +++ glibc-2.5/include-native/libintl.h  2006-11-26 17:26:05.000000000 -0500 | 
|---|
| [32edd3a] | 100 | @@ -0,0 +1,13 @@ | 
|---|
|  | 101 | +#include_next <libintl.h> | 
|---|
|  | 102 | + | 
|---|
|  | 103 | +#ifndef _ | 
|---|
|  | 104 | +#define _(X) (X) | 
|---|
|  | 105 | +#endif | 
|---|
|  | 106 | + | 
|---|
|  | 107 | +#ifndef N_ | 
|---|
|  | 108 | +#define N_(X) (X) | 
|---|
|  | 109 | +#endif | 
|---|
|  | 110 | + | 
|---|
|  | 111 | +#ifndef _libc_intl_domainname | 
|---|
|  | 112 | +#define _libc_intl_domainname "libc" | 
|---|
|  | 113 | +#endif | 
|---|
|  | 114 | diff -Naur glibc-2.5.orig/include-native/symbol-hacks.h glibc-2.5/include-native/symbol-hacks.h | 
|---|
|  | 115 | --- glibc-2.5.orig/include-native/symbol-hacks.h        1969-12-31 19:00:00.000000000 -0500 | 
|---|
| [ffd1587] | 116 | +++ glibc-2.5/include-native/symbol-hacks.h     2006-11-26 17:26:05.000000000 -0500 | 
|---|
| [32edd3a] | 117 | @@ -0,0 +1 @@ | 
|---|
|  | 118 | +/* Empty */ | 
|---|
|  | 119 | diff -Naur glibc-2.5.orig/include-native/tls.h glibc-2.5/include-native/tls.h | 
|---|
|  | 120 | --- glibc-2.5.orig/include-native/tls.h 1969-12-31 19:00:00.000000000 -0500 | 
|---|
| [ffd1587] | 121 | +++ glibc-2.5/include-native/tls.h      2006-11-26 17:26:05.000000000 -0500 | 
|---|
| [32edd3a] | 122 | @@ -0,0 +1,11 @@ | 
|---|
|  | 123 | +#ifndef _include_tls_h | 
|---|
|  | 124 | +#define _include_tls_h 1 | 
|---|
|  | 125 | + | 
|---|
|  | 126 | +#if USE_TLS && HAVE___THREAD \ | 
|---|
|  | 127 | +    && (!defined NOT_IN_libc || defined IS_IN_libpthread) | 
|---|
|  | 128 | +# define USE___THREAD 1 | 
|---|
|  | 129 | +#else | 
|---|
|  | 130 | +# define USE___THREAD 0 | 
|---|
|  | 131 | +#endif | 
|---|
|  | 132 | + | 
|---|
|  | 133 | +#endif | 
|---|
|  | 134 | diff -Naur glibc-2.5.orig/locale/Makefile glibc-2.5/locale/Makefile | 
|---|
| [ffd1587] | 135 | --- glibc-2.5.orig/locale/Makefile      2005-12-20 01:58:41.000000000 -0500 | 
|---|
|  | 136 | +++ glibc-2.5/locale/Makefile   2006-11-26 17:26:05.000000000 -0500 | 
|---|
| [32edd3a] | 137 | @@ -44,6 +44,9 @@ | 
|---|
|  | 138 | aux            = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ | 
|---|
|  | 139 | xlocale localename global-locale coll-lookup | 
|---|
|  | 140 | others         = localedef locale | 
|---|
|  | 141 | +ifneq ($(cross-compiling),no) | 
|---|
|  | 142 | +others-native  = localedef-native | 
|---|
|  | 143 | +endif | 
|---|
|  | 144 | #others-static = localedef locale | 
|---|
|  | 145 | install-bin    = localedef locale | 
|---|
|  | 146 | extra-objs     = $(localedef-modules:=.o) $(localedef-aux:=.o) \ | 
|---|
|  | 147 | @@ -81,6 +84,12 @@ | 
|---|
|  | 148 | $(objpfx)locale: $(locale-modules:%=$(objpfx)%.o) | 
|---|
|  | 149 | $(objpfx)localedef $(objpfx)locale: $(lib-modules:%=$(objpfx)%.o) | 
|---|
|  | 150 |  | 
|---|
|  | 151 | +ifneq ($(cross-compiling),no) | 
|---|
|  | 152 | +$(objpfx)localedef-native: $(localedef-modules:%=$(objpfx)%-native.o) | 
|---|
|  | 153 | +$(objpfx)localedef-native: $(localedef-aux:%=$(objpfx)%-native.o) | 
|---|
|  | 154 | +$(objpfx)localedef-native: $(lib-modules:%=$(objpfx)%-native.o) | 
|---|
|  | 155 | +endif | 
|---|
|  | 156 | + | 
|---|
|  | 157 | C-translit.h: C-translit.h.in gen-translit.pl | 
|---|
|  | 158 | $(PERL) gen-translit.pl < $< > $@.tmp | 
|---|
|  | 159 | mv -f $@.tmp $@ | 
|---|
|  | 160 | diff -Naur glibc-2.5.orig/localedata/Makefile glibc-2.5/localedata/Makefile | 
|---|
| [ffd1587] | 161 | --- glibc-2.5.orig/localedata/Makefile  2006-04-26 01:14:03.000000000 -0400 | 
|---|
|  | 162 | +++ glibc-2.5/localedata/Makefile       2006-11-26 17:26:05.000000000 -0500 | 
|---|
| [32edd3a] | 163 | @@ -206,8 +206,13 @@ | 
|---|
|  | 164 | INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) | 
|---|
|  | 165 |  | 
|---|
|  | 166 | # Sometimes the whole collection of locale files should be installed. | 
|---|
|  | 167 | +ifeq ($(cross-compiling),no) | 
|---|
|  | 168 | LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ | 
|---|
|  | 169 | $(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef | 
|---|
|  | 170 | +else | 
|---|
|  | 171 | +LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ | 
|---|
|  | 172 | +$(common-objpfx)locale/localedef-native | 
|---|
|  | 173 | +endif | 
|---|
|  | 174 | install-locales: $(INSTALL-SUPPORTED-LOCALES) | 
|---|
|  | 175 |  | 
|---|
|  | 176 | install-locales-dir: | 
|---|
| [ffd1587] | 177 | diff -Naur glibc-2.5.orig/Makeconfig glibc-2.5/Makeconfig | 
|---|
|  | 178 | --- glibc-2.5.orig/Makeconfig   2006-07-10 17:42:27.000000000 -0400 | 
|---|
|  | 179 | +++ glibc-2.5/Makeconfig        2006-11-26 18:24:54.000000000 -0500 | 
|---|
|  | 180 | @@ -447,6 +447,13 @@ | 
|---|
|  | 181 | $(common-objpfx)libc% $(+postinit),$^) \ | 
|---|
|  | 182 | $(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit) | 
|---|
|  | 183 | endif | 
|---|
|  | 184 | +# Command for linking programs against the host system. | 
|---|
|  | 185 | +ifndef +link-native | 
|---|
|  | 186 | ++link-native = $(BUILD_CC) -static -g -o $@ $^ \ | 
|---|
|  | 187 | +              $(LDFLAGS) $(LDFLAGS-$(@F)) \ | 
|---|
|  | 188 | +              $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \ | 
|---|
|  | 189 | +              $(link-extra-libs) | 
|---|
|  | 190 | +endif | 
|---|
|  | 191 | # Command for statically linking bounded-pointer programs with the C library. | 
|---|
|  | 192 | ifndef +link-bounded | 
|---|
|  | 193 | +link-bounded = $(CC) -nostdlib -nostartfiles -static -fbounded-pointers -o $@ \ | 
|---|
|  | 194 | @@ -660,6 +667,8 @@ | 
|---|
|  | 195 | $(+sysdep-includes) $(includes) \ | 
|---|
|  | 196 | $(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes) | 
|---|
|  | 197 |  | 
|---|
|  | 198 | ++includes-native = -I$(..)include-native -I$(objpfx) -I. | 
|---|
|  | 199 | + | 
|---|
|  | 200 | # Since libio has several internal header files, we use a -I instead | 
|---|
|  | 201 | # of many little headers in the include directory. | 
|---|
|  | 202 | libio-include = -I$(..)libio | 
|---|
|  | 203 | @@ -674,10 +683,15 @@ | 
|---|
|  | 204 | $(foreach lib,$(libof-$(basename $(@F))) \ | 
|---|
|  | 205 | $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \ | 
|---|
|  | 206 | $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F))) | 
|---|
|  | 207 | +CPPFLAGS-native = -D_GNU_SOURCE $($(subdir)-CPPFLAGS) $(+includes-native) $(defines) \ | 
|---|
|  | 208 | +           $(CPPFLAGS-$(suffix $@)) -include $(..)include/libc-symbols.h \ | 
|---|
|  | 209 | +           $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F))) | 
|---|
|  | 210 | override CFLAGS        = -std=gnu99 \ | 
|---|
|  | 211 | $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \ | 
|---|
|  | 212 | $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \ | 
|---|
|  | 213 | $(CFLAGS-$(@F)) | 
|---|
|  | 214 | +override CFLAGS-native = -std=gnu99 $(default_cflags) $(+gccwarn-c) \ | 
|---|
|  | 215 | +                  $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F)) | 
|---|
|  | 216 | override CXXFLAGS = $(c++-sysincludes) \ | 
|---|
|  | 217 | $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \ | 
|---|
|  | 218 | $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F)) | 
|---|
|  | 219 | diff -Naur glibc-2.5.orig/Makerules glibc-2.5/Makerules | 
|---|
|  | 220 | --- glibc-2.5.orig/Makerules    2006-09-04 22:02:13.000000000 -0400 | 
|---|
|  | 221 | +++ glibc-2.5/Makerules 2006-11-26 18:15:25.000000000 -0500 | 
|---|
|  | 222 | @@ -292,6 +292,9 @@ | 
|---|
|  | 223 | object-suffixes-left := $(all-object-suffixes) | 
|---|
|  | 224 | include $(o-iterator) | 
|---|
|  | 225 |  | 
|---|
|  | 226 | +$(objpfx)%-native.o: %.c $(before-compile) | 
|---|
|  | 227 | +       $(native-compile-command.c) | 
|---|
|  | 228 | + | 
|---|
|  | 229 | # Omit the objpfx rules when building in the source tree, because | 
|---|
|  | 230 | # objpfx is empty and so these rules just override the ones above. | 
|---|
|  | 231 | ifdef objpfx | 
|---|
|  | 232 | @@ -368,6 +371,8 @@ | 
|---|
|  | 233 | compile-command.s = $(COMPILE.s) $< $(OUTPUT_OPTION) $(compile-mkdep-flags) | 
|---|
|  | 234 | compile-command.c = $(compile.c) $(OUTPUT_OPTION) $(compile-mkdep-flags) | 
|---|
|  | 235 | compile-command.cc = $(compile.cc) $(OUTPUT_OPTION) $(compile-mkdep-flags) | 
|---|
|  | 236 | +# Native commands | 
|---|
|  | 237 | +native-compile-command.c = $(native-compile.c) $(OUTPUT_OPTION) $(compile-mkdep-flags) | 
|---|
|  | 238 |  | 
|---|
|  | 239 | # GCC can grok options after the file name, and it looks nicer that way. | 
|---|
|  | 240 | compile.c = $(CC) $< -c $(CFLAGS) $(CPPFLAGS) | 
|---|
|  | 241 | @@ -377,6 +382,8 @@ | 
|---|
|  | 242 | COMPILE.S = $(CC) -c $(CPPFLAGS) $(S-CPPFLAGS) \ | 
|---|
|  | 243 | $(ASFLAGS) $(ASFLAGS-$(suffix $@)) | 
|---|
|  | 244 | COMPILE.s = $(filter-out -pipe,$(CC)) -c $(ASFLAGS) | 
|---|
|  | 245 | +# Native commands | 
|---|
|  | 246 | +native-compile.c = $(BUILD_CC) -g $< -c $(CFLAGS-native) $(CPPFLAGS-native) | 
|---|
|  | 247 |  | 
|---|
|  | 248 | # We need this for the output to go in the right place.  It will default to | 
|---|
|  | 249 | # empty if make was configured to work with a cc that can't grok -c and -o | 
|---|
|  | 250 | @@ -1168,7 +1175,7 @@ | 
|---|
|  | 251 | $(make-target-directory) | 
|---|
|  | 252 | $(patsubst %/,cd % &&,$(objpfx)) \ | 
|---|
|  | 253 | $(BUILD_CC) $($(basename $(<F))-CFLAGS) $(ALL_BUILD_CFLAGS) \ | 
|---|
|  | 254 | -           $(firstword $(filter /%,$< $(shell pwd)/$<)) -o $(@F) | 
|---|
|  | 255 | +           $(addprefix $(shell pwd)/, $^) -o $(@F) | 
|---|
|  | 256 | endef | 
|---|
|  | 257 |  | 
|---|
|  | 258 | # Command to compile $< in $(common-objdir) using the native libraries. | 
|---|
| [32edd3a] | 259 | diff -Naur glibc-2.5.orig/malloc/Makefile glibc-2.5/malloc/Makefile | 
|---|
| [ffd1587] | 260 | --- glibc-2.5.orig/malloc/Makefile      2006-05-19 12:42:00.000000000 -0400 | 
|---|
|  | 261 | +++ glibc-2.5/malloc/Makefile   2006-11-26 17:26:05.000000000 -0500 | 
|---|
| [32edd3a] | 262 | @@ -73,10 +73,6 @@ | 
|---|
|  | 263 | endif | 
|---|
|  | 264 | endif | 
|---|
|  | 265 |  | 
|---|
|  | 266 | -# Unless we get a test for the availability of libgd which also works | 
|---|
|  | 267 | -# for cross-compiling we disable the memusagestat generation in this | 
|---|
|  | 268 | -# situation. | 
|---|
|  | 269 | -ifneq ($(cross-compiling),yes) | 
|---|
|  | 270 | # If the gd library is available we build the `memusagestat' program. | 
|---|
|  | 271 | ifneq ($(LIBGD),no) | 
|---|
|  | 272 | others: $(objpfx)memusage | 
|---|
|  | 273 | @@ -91,7 +87,6 @@ | 
|---|
|  | 274 | # is to presume that the standard system headers will be ok for this file. | 
|---|
|  | 275 | $(objpfx)memusagestat.o: sysincludes = # nothing | 
|---|
|  | 276 | endif | 
|---|
|  | 277 | -endif | 
|---|
|  | 278 |  | 
|---|
|  | 279 | # Another goal which can be used to override the configure decision. | 
|---|
|  | 280 | .PHONY: do-memusagestat | 
|---|
| [ffd1587] | 281 | diff -Naur glibc-2.5.orig/Rules glibc-2.5/Rules | 
|---|
|  | 282 | --- glibc-2.5.orig/Rules        2006-02-28 02:05:48.000000000 -0500 | 
|---|
|  | 283 | +++ glibc-2.5/Rules     2006-11-26 17:26:05.000000000 -0500 | 
|---|
|  | 284 | @@ -87,7 +87,7 @@ | 
|---|
|  | 285 |  | 
|---|
|  | 286 | .PHONY: others tests | 
|---|
|  | 287 | ifeq ($(build-programs),yes) | 
|---|
|  | 288 | -others: $(addprefix $(objpfx),$(others) $(sysdep-others) $(extra-objs)) | 
|---|
|  | 289 | +others: $(addprefix $(objpfx),$(others) $(others-native) $(sysdep-others) $(extra-objs)) | 
|---|
|  | 290 | else | 
|---|
|  | 291 | others: $(addprefix $(objpfx),$(extra-objs)) | 
|---|
|  | 292 | endif | 
|---|
|  | 293 | @@ -106,9 +106,11 @@ | 
|---|
|  | 294 | ifeq ($(build-programs),yes) | 
|---|
|  | 295 | binaries-all = $(others) $(sysdep-others) $(tests) $(xtests) $(test-srcs) | 
|---|
|  | 296 | binaries-static = $(others-static) $(tests-static) $(xtests-static) | 
|---|
|  | 297 | +binaries-native = $(others-native) | 
|---|
|  | 298 | else | 
|---|
|  | 299 | binaries-all = $(tests) $(xtests) $(test-srcs) | 
|---|
|  | 300 | binaries-static = | 
|---|
|  | 301 | +binaries-native = | 
|---|
|  | 302 | endif | 
|---|
|  | 303 |  | 
|---|
|  | 304 | binaries-shared = $(filter-out $(binaries-static), $(binaries-all)) | 
|---|
|  | 305 | @@ -127,6 +129,11 @@ | 
|---|
|  | 306 | $(+link-static) | 
|---|
|  | 307 | endif | 
|---|
|  | 308 |  | 
|---|
|  | 309 | +ifneq "$(strip $(binaries-native))" "" | 
|---|
|  | 310 | +$(addprefix $(objpfx),$(binaries-native)): %: %.o | 
|---|
|  | 311 | +       $(+link-native) | 
|---|
|  | 312 | +endif | 
|---|
|  | 313 | + | 
|---|
|  | 314 | ifeq ($(build-bounded),yes) | 
|---|
|  | 315 | binaries-bounded = $(addsuffix -bp,$(tests) $(xtests) $(test-srcs)) | 
|---|
|  | 316 | $(addprefix $(objpfx),$(binaries-bounded)): %-bp: %.ob \ | 
|---|
| [32edd3a] | 317 | diff -Naur glibc-2.5.orig/sunrpc/Makefile glibc-2.5/sunrpc/Makefile | 
|---|
| [ffd1587] | 318 | --- glibc-2.5.orig/sunrpc/Makefile      2005-06-26 14:24:19.000000000 -0400 | 
|---|
|  | 319 | +++ glibc-2.5/sunrpc/Makefile   2006-11-26 17:26:05.000000000 -0500 | 
|---|
| [32edd3a] | 320 | @@ -70,6 +70,9 @@ | 
|---|
|  | 321 | clnt_unix svc_unix create_xid xdr_intXX_t | 
|---|
|  | 322 |  | 
|---|
|  | 323 | others := rpcinfo | 
|---|
|  | 324 | +ifneq ($(cross-compiling),no) | 
|---|
|  | 325 | +others-native := rpcgen-native | 
|---|
|  | 326 | +endif | 
|---|
|  | 327 | install-bin := rpcgen | 
|---|
|  | 328 | install-sbin := rpcinfo | 
|---|
|  | 329 | rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \ | 
|---|
|  | 330 | @@ -98,15 +101,12 @@ | 
|---|
|  | 331 | $(resolvobjdir)/libresolv.a | 
|---|
|  | 332 | endif | 
|---|
|  | 333 |  | 
|---|
|  | 334 | -ifeq (no,$(cross-compiling)) | 
|---|
|  | 335 | -# We can only build this library if we can run the rpcgen we build. | 
|---|
|  | 336 | headers += $(rpcsvc:%.x=rpcsvc/%.h) | 
|---|
|  | 337 | extra-libs := librpcsvc | 
|---|
|  | 338 | extra-libs-others := librpcsvc # Make it in `others' pass, not `lib' pass. | 
|---|
|  | 339 | librpcsvc-routines = $(rpcsvc:%.x=x%) | 
|---|
|  | 340 | librpcsvc-inhibit-o = .os # Build no shared rpcsvc library. | 
|---|
|  | 341 | omit-deps = $(librpcsvc-routines) | 
|---|
|  | 342 | -endif | 
|---|
|  | 343 |  | 
|---|
|  | 344 | CFLAGS-xbootparam_prot.c = -Wno-unused $(PIC-ccflag) | 
|---|
|  | 345 | CFLAGS-xnlm_prot.c = -Wno-unused $(PIC-ccflag) | 
|---|
|  | 346 | @@ -136,13 +136,26 @@ | 
|---|
|  | 347 | $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit) | 
|---|
|  | 348 | $(+link) | 
|---|
|  | 349 |  | 
|---|
|  | 350 | +ifneq ($(cross-compiling),no) | 
|---|
|  | 351 | +rpcgen.c: | 
|---|
|  | 352 | +       touch rpcgen.c | 
|---|
|  | 353 | + | 
|---|
|  | 354 | +$(objpfx)rpcgen-native: $(addprefix $(objpfx),$(rpcgen-objs:%.o=%-native.o)) | 
|---|
|  | 355 | +endif | 
|---|
|  | 356 | + | 
|---|
|  | 357 | # This makes sure -DNOT_IN_libc is passed for all these modules. | 
|---|
|  | 358 | cpp-srcs-left := $(rpcgen-objs:.o=.c) | 
|---|
|  | 359 | lib := nonlib | 
|---|
|  | 360 | include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left)) | 
|---|
|  | 361 |  | 
|---|
|  | 362 | # Tell rpcgen where to find the C preprocessor. | 
|---|
|  | 363 | +ifeq ($(cross-compiling),no) | 
|---|
|  | 364 | rpcgen-cmd = CPP='$(CC) -E -x c-header' $(built-program-cmd) -Y ../scripts | 
|---|
|  | 365 | +rpcgen = $(objpfx)rpcgen | 
|---|
|  | 366 | +else | 
|---|
|  | 367 | +rpcgen-cmd = CPP='$(CC) -E -x c-header' $(objpfx)rpcgen-native -Y ../scripts | 
|---|
|  | 368 | +rpcgen = $(objpfx)rpcgen-native | 
|---|
|  | 369 | +endif | 
|---|
|  | 370 |  | 
|---|
|  | 371 | # Install the rpc data base file. | 
|---|
|  | 372 | $(inst_sysconfdir)/rpc: etc.rpc $(+force) | 
|---|
|  | 373 | @@ -153,7 +166,7 @@ | 
|---|
|  | 374 | # relinked. | 
|---|
|  | 375 | $(rpcsvc:%.x=$(objpfx)rpcsvc/%.h): $(objpfx)rpcsvc/%.h: $(objpfx)rpcsvc/%.stmp | 
|---|
|  | 376 | @: | 
|---|
|  | 377 | -$(objpfx)rpcsvc/%.stmp: rpcsvc/%.x $(objpfx)rpcgen | 
|---|
|  | 378 | +$(objpfx)rpcsvc/%.stmp: rpcsvc/%.x $(rpcgen) | 
|---|
|  | 379 | $(make-target-directory) | 
|---|
|  | 380 | -@rm -f ${@:stmp=T} $@ | 
|---|
|  | 381 | $(rpcgen-cmd) -h $< -o ${@:stmp=T} | 
|---|
|  | 382 | @@ -163,7 +176,7 @@ | 
|---|
|  | 383 | # Generate the rpcsvc XDR functions with rpcgen. | 
|---|
|  | 384 | $(rpcsvc:%.x=$(objpfx)x%.c): $(objpfx)x%.c: $(objpfx)x%.stmp | 
|---|
|  | 385 | @: | 
|---|
|  | 386 | -$(objpfx)x%.stmp: rpcsvc/%.x $(objpfx)rpcgen | 
|---|
|  | 387 | +$(objpfx)x%.stmp: rpcsvc/%.x $(rpcgen) | 
|---|
|  | 388 | -@rm -f ${@:stmp=T} $@ | 
|---|
|  | 389 | $(rpcgen-cmd) -c $< -o ${@:stmp=T} | 
|---|
|  | 390 | $(move-if-change) $(@:stmp=T) $(@:stmp=c) | 
|---|
|  | 391 | diff -Naur glibc-2.5.orig/timezone/Makefile glibc-2.5/timezone/Makefile | 
|---|
| [ffd1587] | 392 | --- glibc-2.5.orig/timezone/Makefile    2005-04-15 16:09:08.000000000 -0400 | 
|---|
|  | 393 | +++ glibc-2.5/timezone/Makefile 2006-11-26 17:26:05.000000000 -0500 | 
|---|
| [32edd3a] | 394 | @@ -28,6 +28,9 @@ | 
|---|
|  | 395 | extra-objs := scheck.o ialloc.o | 
|---|
|  | 396 |  | 
|---|
|  | 397 | others := zdump zic | 
|---|
|  | 398 | +ifneq ($(cross-compiling),no) | 
|---|
|  | 399 | +others-native := zic-native | 
|---|
|  | 400 | +endif | 
|---|
|  | 401 | tests  := test-tz tst-timezone | 
|---|
|  | 402 |  | 
|---|
|  | 403 | tzbases := africa antarctica asia australasia europe northamerica \ | 
|---|
|  | 404 | @@ -69,13 +72,10 @@ | 
|---|
|  | 405 | $(addprefix $(inst_zonedir)/, \ | 
|---|
|  | 406 | $(posixrules-file))) | 
|---|
|  | 407 |  | 
|---|
|  | 408 | -ifeq ($(cross-compiling),no) | 
|---|
|  | 409 | -# Don't try to install the zoneinfo files since we can't run zic. | 
|---|
|  | 410 | install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \ | 
|---|
|  | 411 | $(zonenames:%=posix/%) \ | 
|---|
|  | 412 | $(zonenames:%=right/%)) \ | 
|---|
|  | 413 | $(installed-localtime-file) $(installed-posixrules-file) | 
|---|
|  | 414 | -endif | 
|---|
|  | 415 |  | 
|---|
|  | 416 | ifeq ($(have-ksh),yes) | 
|---|
|  | 417 | install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab | 
|---|
|  | 418 | @@ -128,7 +128,11 @@ | 
|---|
|  | 419 | # We have to use `-d $(inst_zonedir)' to explictly tell zic where to | 
|---|
|  | 420 | # place the output files although $(zonedir) is compiled in.  But the | 
|---|
|  | 421 | # user might have set $(install_root) on the command line of `make install'. | 
|---|
|  | 422 | +ifeq ($(cross-compiling),no) | 
|---|
|  | 423 | zic-cmd = $(built-program-cmd) -d $(inst_zonedir) | 
|---|
|  | 424 | +else | 
|---|
|  | 425 | +zic-cmd = $(common-objpfx)/timezone/zic-native -d $(inst_zonedir) | 
|---|
|  | 426 | +endif | 
|---|
|  | 427 | tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \ | 
|---|
|  | 428 | -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $< | 
|---|
|  | 429 |  | 
|---|
|  | 430 | @@ -158,8 +162,10 @@ | 
|---|
|  | 431 | $(zic-cmd) -p $(posixrules) | 
|---|
|  | 432 | endif | 
|---|
|  | 433 |  | 
|---|
|  | 434 | - | 
|---|
|  | 435 | $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o | 
|---|
|  | 436 | +ifneq ($(cross-compiling),no) | 
|---|
|  | 437 | +$(objpfx)zic-native:  $(objpfx)scheck-native.o $(objpfx)ialloc-native.o | 
|---|
|  | 438 | +endif | 
|---|
|  | 439 |  | 
|---|
|  | 440 | tz-cflags = -DTZDIR='"$(zonedir)"' \ | 
|---|
|  | 441 | -DTZDEFAULT='"$(localtime-file)"' \ | 
|---|