Submitted By: Joe Ciccone Date: 2006-11-26 Initial Package Version: 2.5 Rediffed against 2.6 by Joe Ciccone Origin: Joe Ciccone Upstream Status: Unknown Description: Adds native compile support to the build system then uses that support to build zic-native, for installing timezone info, rpcgen-native, for building librpcsvc.a, and localedef-native, for creating the locale-archive. diff -Naur glibc-2.6.orig/iconv/Makefile glibc-2.6/iconv/Makefile --- glibc-2.6.orig/iconv/Makefile 2007-07-02 15:20:36.000000000 -0400 +++ glibc-2.6/iconv/Makefile 2007-07-02 15:28:24.000000000 -0400 @@ -56,6 +56,9 @@ iconvconfig.h others = iconv_prog iconvconfig +ifneq ($(cross-compiling),no) +others-native = iconvconfig-native +endif install-others = $(inst_bindir)/iconv install-sbin = iconvconfig @@ -78,6 +81,7 @@ $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o) $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o) +$(objpfx)iconvconfig-native: $(iconvconfig-modules:%=$(objpfx)%-native.o) ifneq ($(cross-compiling),yes) xtests: test-iconvconfig diff -Naur glibc-2.6.orig/iconvdata/Makefile glibc-2.6/iconvdata/Makefile --- glibc-2.6.orig/iconvdata/Makefile 2007-07-02 15:20:35.000000000 -0400 +++ glibc-2.6/iconvdata/Makefile 2007-07-02 15:28:24.000000000 -0400 @@ -312,23 +312,25 @@ headers: $(addprefix $(objpfx), $(generated-modules:=.h)) +ifeq ($(cross-compiling),no) +iconvconfig-cmd = LC_ALL=C LANGUAGE=C \ + $(common-objpfx)elf/ld.so --library-path $(rpath-link) \ + $(common-objpfx)iconv/iconvconfig +else +iconvconfig-cmd = LC_ALL=C LANGUAGE=C \ + $(common-objpfx)iconv/iconvconfig-native +endif + $(addprefix $(inst_gconvdir)/, $(modules.so)): \ $(inst_gconvdir)/%: $(objpfx)% $(+force) $(do-install-program) $(inst_gconvdir)/gconv-modules: gconv-modules $(+force) $(do-install) -ifeq (no,$(cross-compiling)) # Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary # if this libc has more gconv modules than the previously installed one. if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \ - LC_ALL=C LANGUAGE=C \ - $(common-objpfx)elf/ld.so --library-path $(rpath-link) \ - $(common-objpfx)iconv/iconvconfig \ - $(addprefix --prefix=,$(install_root)); \ + $(iconvconfig-cmd) $(addprefix --prefix=,$(install_root)); \ fi -else - @echo '*@*@*@ You should recreate $(inst_gconvdir)/gconv-modules.cache' -endif endif # build-shared = yes diff -Naur glibc-2.6.orig/include-native/bits/libc-tsd.h glibc-2.6/include-native/bits/libc-tsd.h --- glibc-2.6.orig/include-native/bits/libc-tsd.h 1969-12-31 19:00:00.000000000 -0500 +++ glibc-2.6/include-native/bits/libc-tsd.h 2007-07-02 15:28:24.000000000 -0400 @@ -0,0 +1,3 @@ +#ifndef __libc_tsd_define +#define __libc_tsd_define(A,B) +#endif diff -Naur glibc-2.6.orig/include-native/config.h glibc-2.6/include-native/config.h --- glibc-2.6.orig/include-native/config.h 1969-12-31 19:00:00.000000000 -0500 +++ glibc-2.6/include-native/config.h 2007-07-02 15:28:24.000000000 -0400 @@ -0,0 +1 @@ +/* Empty */ diff -Naur glibc-2.6.orig/include-native/gnu/stubs.h glibc-2.6/include-native/gnu/stubs.h --- glibc-2.6.orig/include-native/gnu/stubs.h 1969-12-31 19:00:00.000000000 -0500 +++ glibc-2.6/include-native/gnu/stubs.h 2007-07-02 15:28:24.000000000 -0400 @@ -0,0 +1 @@ +/* Empty */ diff -Naur glibc-2.6.orig/include-native/intl/loadinfo.h glibc-2.6/include-native/intl/loadinfo.h --- glibc-2.6.orig/include-native/intl/loadinfo.h 1969-12-31 19:00:00.000000000 -0500 +++ glibc-2.6/include-native/intl/loadinfo.h 2007-07-02 15:28:24.000000000 -0400 @@ -0,0 +1,4 @@ +#ifndef LOADINFO_H +#define LOADINFO_H +struct loaded_l10nfile; +#endif diff -Naur glibc-2.6.orig/include-native/libintl.h glibc-2.6/include-native/libintl.h --- glibc-2.6.orig/include-native/libintl.h 1969-12-31 19:00:00.000000000 -0500 +++ glibc-2.6/include-native/libintl.h 2007-07-02 15:28:24.000000000 -0400 @@ -0,0 +1,13 @@ +#include_next + +#ifndef _ +#define _(X) (X) +#endif + +#ifndef N_ +#define N_(X) (X) +#endif + +#ifndef _libc_intl_domainname +#define _libc_intl_domainname "libc" +#endif diff -Naur glibc-2.6.orig/include-native/symbol-hacks.h glibc-2.6/include-native/symbol-hacks.h --- glibc-2.6.orig/include-native/symbol-hacks.h 1969-12-31 19:00:00.000000000 -0500 +++ glibc-2.6/include-native/symbol-hacks.h 2007-07-02 15:28:24.000000000 -0400 @@ -0,0 +1 @@ +/* Empty */ diff -Naur glibc-2.6.orig/include-native/tls.h glibc-2.6/include-native/tls.h --- glibc-2.6.orig/include-native/tls.h 1969-12-31 19:00:00.000000000 -0500 +++ glibc-2.6/include-native/tls.h 2007-07-02 15:28:24.000000000 -0400 @@ -0,0 +1,11 @@ +#ifndef _include_tls_h +#define _include_tls_h 1 + +#if USE_TLS && HAVE___THREAD \ + && (!defined NOT_IN_libc || defined IS_IN_libpthread) +# define USE___THREAD 1 +#else +# define USE___THREAD 0 +#endif + +#endif diff -Naur glibc-2.6.orig/locale/Makefile glibc-2.6/locale/Makefile --- glibc-2.6.orig/locale/Makefile 2007-07-02 15:20:37.000000000 -0400 +++ glibc-2.6/locale/Makefile 2007-07-02 15:28:24.000000000 -0400 @@ -44,6 +44,9 @@ aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ xlocale localename global-locale coll-lookup others = localedef locale +ifneq ($(cross-compiling),no) +others-native = localedef-native +endif #others-static = localedef locale install-bin = localedef locale extra-objs = $(localedef-modules:=.o) $(localedef-aux:=.o) \ @@ -81,6 +84,12 @@ $(objpfx)locale: $(locale-modules:%=$(objpfx)%.o) $(objpfx)localedef $(objpfx)locale: $(lib-modules:%=$(objpfx)%.o) +ifneq ($(cross-compiling),no) +$(objpfx)localedef-native: $(localedef-modules:%=$(objpfx)%-native.o) +$(objpfx)localedef-native: $(localedef-aux:%=$(objpfx)%-native.o) +$(objpfx)localedef-native: $(lib-modules:%=$(objpfx)%-native.o) +endif + C-translit.h: C-translit.h.in gen-translit.pl $(PERL) gen-translit.pl < $< > $@.tmp mv -f $@.tmp $@ diff -Naur glibc-2.6.orig/localedata/Makefile glibc-2.6/localedata/Makefile --- glibc-2.6.orig/localedata/Makefile 2007-07-02 15:20:34.000000000 -0400 +++ glibc-2.6/localedata/Makefile 2007-07-02 15:28:24.000000000 -0400 @@ -206,8 +206,13 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) # Sometimes the whole collection of locale files should be installed. +ifeq ($(cross-compiling),no) LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ $(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef +else +LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ +$(common-objpfx)locale/localedef-native +endif install-locales: $(INSTALL-SUPPORTED-LOCALES) install-locales-dir: diff -Naur glibc-2.6.orig/Makeconfig glibc-2.6/Makeconfig --- glibc-2.6.orig/Makeconfig 2007-07-02 15:20:36.000000000 -0400 +++ glibc-2.6/Makeconfig 2007-07-02 15:32:37.000000000 -0400 @@ -445,6 +445,13 @@ $(common-objpfx)libc% $(+postinit),$^) \ $(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit) endif +# Command for linking programs against the host system. +ifndef +link-native ++link-native = $(BUILD_CC) -static -g -o $@ $^ \ + $(LDFLAGS) $(LDFLAGS-$(@F)) \ + $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \ + $(link-extra-libs) +endif # Command for statically linking bounded-pointer programs with the C library. ifndef +link-bounded +link-bounded = $(CC) -nostdlib -nostartfiles -static -fbounded-pointers -o $@ \ @@ -658,6 +665,8 @@ $(+sysdep-includes) $(includes) \ $(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes) ++includes-native = -I$(..)include-native -I$(objpfx) -I. + # Since libio has several internal header files, we use a -I instead # of many little headers in the include directory. libio-include = -I$(..)libio @@ -672,10 +681,15 @@ $(foreach lib,$(libof-$(basename $(@F))) \ $(libof-$(