| [svn] / branches / eglibc-2_9 / libc / nss / Makefile |
Create EGLIBC 2.9 branch as copy of trunk.
* Makeconfig ($(common-objpfx)gnu/option-groups.h): New generated header. * scripts/option-groups.awk: New script, to generate it. * debug/Makefile (CFLAGS-segfault.c): Don't define option group symbols here. * wcsmbs/Makefile (CFLAGS-wcsmbsload.c): Same. * time/Makefile (CFLAGS-strftime_l.c, CFLAGS-strptime_l.c): Same. * intl/Makefile (CFLAGS-dcigettext.c): Same. * sysdeps/unix/sysv/linux/Makefile (CFLAGS-gethostid.c) (CFLAGS-libc_fatal.c): Same. * misc/Makefile (CFLAGS-error.c, CFLAGS-err.c): Same. * nss/Makefile (CFLAGS-nsswitch.c, CFLAGS-getnssent_r.c) (CFLAGS-getent.c): Same. * string/Makefile (CFLAGS-strerror_l.c): Same. * iconv/Makefile (CFLAGS-gconv_db.c, CFLAGS-gconv_trans.c) (CFLAGS-iconv_prog.c): Same. * locale/Makefile (CFLAGS-C-ctype.c, CFLAGS-xlocale.c) (CFLAGS-ld-messages.c): Same. * argp/Makefile (CFLAGS-argp-help.c, CFLAGS-argp-fmtstream.c): Same. * nptl/Makefile (CFLAGS-pthread_create.c): Same. * posix/Makefile (CFLAGS-glob.c, CFLAGS-bug-regex1.c): Same. * stdio-common/Makefile (CFLAGS-printf_fp.c) (CFLAGS-printf_fphex.c, CFLAGS-fxprintf.c, CFLAGS-tst-popen.c): Same. * libidn/Makefile (CFLAGS-toutf8.c): Same. * debug/segfault.c, wcsmbs/wcsmbsload.c, time/strftime_l.c: * time/strptime_l.c, intl/dcigettext.c: * sysdeps/unix/sysv/linux/libc_fatal.c: * sysdeps/unix/sysv/linux/gethostid.c, misc/err.c, misc/error.c: * nss/getnssent_r.c, nss/nsswitch.c, nss/getent.c: * string/strerror_l.c, iconv/gconv_db.c, iconv/iconv_prog.c: * iconv/gconv_trans.c, locale/xlocale.c, locale/C-ctype.c: * locale/programs/ld-messages.c, argp/argp-help.c: * argp/argp-fmtstream.c, nptl/pthread_create.c, posix/glob.c: * posix/bug-regex1.c, stdio-common/printf_fp.c: * stdio-common/printf_fphex.c, stdio-common/tst-popen.c: * stdio-common/fxprintf.c, libidn/toutf8.c: #include <gnu/option-groups.h>, and test for the symbols that #defines, instead.
* nss/Makefile: Treat OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS and OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG as absolute filenames. * option-groups.def: Update documentation.
Merge changes between r2424 and r3467 from /fsf/trunk.
* nss/Makefile: Delete stray text.
Implement the OPTION_EGLIBC_DB_ALIASES option group. * option-groups.def (OPTION_EGLIBC_DB_ALIASES): New entry. * option-groups.defaults (OPTION_EGLIBC_DB_ALIASES): Initialize. * inet/Makefile (routines): Move getaliasent_r, getaliasent, getaliasname, and getaliasname_r into the group. * nss/Makefile (databases-y): Move alias into the option group. (CFLAGS-getent.c): Define OPTION_EGLIBC_DB_ALIASES as appropriate. * nss/getent.c (print_aliases, aliases_keys): Define these functions only if OPTION_EGLIBC_DB_ALIASES is enabled. (DA): New macro. (databases): Use DA to decide whether to include the aliases database in the list. * nis/Makefile (databases-y): Renamed from databases; uses changed. Put alias in the group.
Implement the OPTION_EGLIBC_NSSWITCH option group. * option-groups.def (OPTION_EGLIBC_NSSWITCH): New entry. * option-groups.defaults (OPTION_EGLIBC_NSSWITCH): Initialize. * nss/fixed-nsswitch.conf, nss/fixed-nsswitch.functions: Sample configuration files. * nss/nsswitch.h (service_user): Change the known function table to a union, with appropriate types for tsearch and for fixed nsswitch. Make the name a pointer. (name_database_entry): Make the name a pointer. * nss/nsswitch.c (nss_parse_file, nss_getline) (nss_parse_service_list, nss_new_service, databases, ndatabases) (lock, lock_nsswitch, unlock_nsswitch) (__nss_shlib_revision, service_table): If OPTION_EGLIBC_NSSWITCH is disabled, include statically generated configuration data; remove code for parsing the configuration file and reconfiguring individual databases dynamically; initialize database and service name pointers; simplify functions for looking up databases and query functions; avoid locking and freeing, since no data changes at runtime. * nss/gen-fixed-nsswitch.c: New program. * nss/Makefile (before-compile, generated): Generate fixed-nsswitch.h. ($(objfix)fixed-nsswitch.h, $(objpfx)gen-fixed-nsswitch) (gen-fixed-nsswitch-CFLAGS): Rules for generating fixed-nsswitch.h. (CFLAGS-nsswitch.c): Define OPTION_EGLIBC_NSSWITCH as appropriate.
Add the OPTION_EGLIBC_INET option group. * option-groups.def (OPTION_EGLIBC_INET): New entry. * option-groups.defaults (OPTION_EGLIBC_INET): Initialize. * option-groups.mak: Add initializer for aux-y. * Makerules (aux): Add in contents of aux-y. * extra-lib.mk (all-$(lib)-routines): Include $($(lib)-routines-y) in the list. (cpp-srcs-left): Refer $(all-$(lib)-routines) instead of spelling its value out. * nscd/Makefile: include option-groups.mak. (routines, aux, others, install-sbin, extra-objs): Place everything here in the option group. * pwd/Makefile: include option-groups.mak. (CFLAGS-getpwuid_r.c, CFLAGS-getpwnam_r.c): Define USE_NSCD only if OPTION_EGLIBC_INET is enabled. * misc/Makefile: include option-groups.mak. * sysdeps/unix/sysv/linux/gethostid.c [!OPTION_EGLIBC_INET]: Don't try to look up our IP address; just return a dummy value. * sysdeps/unix/sysv/linux/Makefile: #define OPTION_EGLIBC_INET appropriately when compiling gethostid.c. * inet/Makefile: include option-groups.mak. (routines, aux): Place all routines in the option group. * nss/Makefile: include option-groups.mak. (databases): Put proto, service, hosts, network, rpc, ethers, netgrp, key, and aliases database in option group. Move assignment to 'databases' above assignment to 'routines', since we generate some of the latter from the former. (routines): Put digits_dots in option group. (tests): Put test-netdb in option group. (xtests): Put bug-erange in option group. (CFLAGS-nsswitch.c, CFLAGS-getnssent_r.c, CFLAGS-getent.c): #define OPTION_EGLIBC_INET as appropriate. * nss/getnssent_r.c (__nss_setent, __nss_endent, __nss_getent_r): Don't try to initialize resolver state unless the option group is enabled. * nss/nssswitch.c (__nss_disable_nscd): Define this only if the option group is enabled. * nss/getent.c (print_aliases, aliases_keys, ethers_keys, print_hosts, hosts_keys, ahosts_keys_int, ahosts_keys, ahostsv4_keys, ahostsv6_keys, netgroup_keys, print_networks, networks_keys, print_protocols, protocols_keys, print_rpc, rpc_keys, print_services, services_keys): Define only #if OPTION_EGLIBC_INET. (DN): New macro. (databases): Make entries for ahosts, ahostsv4, ahostsv6, aliases, ethers, hosts, netgroup, networks, protocols, rpc, and services present only if option group is enabled. * hesiod/Makefile (extra-libs, extra-libs-others): Place all libraries in option group. * grp/Makefile: include option-groups.mak. (CFLAGS-getgruid_r.c, CFLAGS-getgrnam_r.c, CFLAGS-initgroups.c): Define USE_NSCD only if OPTION_EGLIBC_INET is enabled. * nptl/Makefile: include option-groups.mak. (libpthread-routines): Move 'herrno' and 'res' into the option group. (CFLAGS-pthread_create.c): Define OPTION_EGLIBC_INET as appropriate. * nptl/pthread_create.c (start_thread): Initialize and free __resp only when OPTION_EGLIBC_INET is #defined. * posix/Makefile: include option-groups.mak. (routines): Put getaddrinfo and gai_strerror in the option group. (tests, xtests): Move tst-getaddrinfo, bug-ga1, tst-getaddrinfo2, tst-rfc3484, tst-rfc3484-2, tst-getaddrinfo3, and bug-ga2 into the option group. (CFLAGS-getaddrinfo.c): #define USE_NSCD only if the option group is enabled. * resolv/Makefile: include option-groups.mak. (routines, tests, xtests, extra-libs, extra-libs-others): Move everything into the option group. (tests): Only add ga_test as a dependency if the option group is enabled. * sunrpc/Makefile: include option-groups.mak. (install-others, routines, others, install-bin, install-sbin) (extra-objs, tests, xtests, extra-libs, extra-libs-others): Move everything into the option group. * nis/Makefile: include option-groups.mak. (services, extra-libs, extra-libs-others): Move everything into the option group. * option-groups.mak (extra-libs-y, extra-libs-others-y): Add missing initializers. * nss/getnssent_r.c (__nss_getent_r): Pass h_errnop through to the getent function, not &h_errno.
Create EGLIBC trunk.
Import glibc-mainline for 2006-08-16
|
Webmaster Powered by ViewCVS 1.0-dev |
ViewCVS and CVS Help |