[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patches] PATCH: Change meaning of NSSWITCH fixed config file variables
- To: patches@xxxxxxxxxx
- Subject: [patches] PATCH: Change meaning of NSSWITCH fixed config file variables
- From: Jim Blandy <jimb@xxxxxxxxxxxxxxxx>
- Date: Fri, 21 Sep 2007 17:52:28 -0700
The patch below seems to make things easier to use; I've committed it.
ChangeLog.eglibc:
2007-09-21 Jim Blandy <jimb@xxxxxxxxxxxxxxxx>
* nss/Makefile: Treat OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS and
OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG as absolute filenames.
* option-groups.def: Update documentation.
Index: nss/Makefile
===================================================================
--- nss/Makefile (revision 3562)
+++ nss/Makefile (working copy)
@@ -89,33 +89,33 @@
$(error OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS variable left unset)
endif
-ifeq (,$(wildcard $(common-objpfx)$(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG)))
+ifeq (,$(wildcard $(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG)))
$(warning OPTION_EGLIBC_NSSWITCH is disabled, but fixed config file)
$(error does not exist: $(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG))
endif
-ifeq (,$(wildcard $(common-objpfx)$(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS)))
+ifeq (,$(wildcard $(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS)))
$(warning OPTION_EGLIBC_NSSWITCH is disabled, but fixed functions file)
$(error does not exist: $(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS))
endif
before-compile := $(objpfx)fixed-nsswitch.h
generated := fixed-nsswitch.h
-$(objpfx)fixed-nsswitch.h $(objfpx)fixed-nsswitch-libs: \
- $(objpfx)gen-fixed-nsswitch \
- $(common-objpfx)$(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG)
- $< $(objpfx)fixed-nsswitch.h \
- $(objpfx)fixed-nsswitch-libs \
- $(common-objpfx)$(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG)
+$(objpfx)fixed-nsswitch.h $(objfpx)fixed-nsswitch-libs: \
+ $(objpfx)gen-fixed-nsswitch \
+ $(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG)
+ $< $(objpfx)fixed-nsswitch.h \
+ $(objpfx)fixed-nsswitch-libs \
+ $(OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG)
-$(objpfx)gen-fixed-nsswitch: gen-fixed-nsswitch.c \
- $(common-objpfx)option-groups.config \
- $(common-objpfx)$(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS)
+$(objpfx)gen-fixed-nsswitch: gen-fixed-nsswitch.c \
+ $(common-objpfx)option-groups.config \
+ $(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS)
$(native-compile)
-gen-fixed-nsswitch-CFLAGS = \
- -g3 -O -Wall \
- -I $(objpfx) \
- -DFIXED_FUNCTIONS='"$(common-objpfx)$(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS)"'
+gen-fixed-nsswitch-CFLAGS = \
+ -g3 -O -Wall \
+ -I $(objpfx) \
+ -DFIXED_FUNCTIONS='"$(OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS)"'
endif
include ../Rules
Index: option-groups.def
===================================================================
--- option-groups.def (revision 3562)
+++ option-groups.def (working copy)
@@ -447,9 +447,9 @@
specifies, instead of consulting '/etc/nsswitch.conf' at run
time.
- This should be a relative file name; EGLIBC will look for it
- in the top build directory, along with the
- 'option-groups.config' file.
+ This should be an absolute filename. The EGLIBC build
+ process may use it from several different working
+ directories.
The EGLIBC source tree includes a sample configuration file
named 'nss/fixed-nsswitch.conf'; for simple configurations,
@@ -464,9 +464,9 @@
configuration file for this setting, and explains its syntax
and meaning in more detail.
- This should be a relative file name; EGLIBC will look for it
- in the top build directory, along with the
- 'option-groups.config' file.
+ This should be an absolute file name. The EGLIBC build
+ process may use it from several different working
+ directories.
Be sure to mention each function in each service you wish to
use. If you do not mention a service's function here, the