From 73237de3761836016f67a10121ecc97a5d45cac4 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 9 Apr 1998 10:14:17 +0000 Subject: Update. 1998-04-08 Andreas Schwab * configure.in: Add new option --enable-force-install. Substitute force_install. * config.make.in (force-install): Set from configure. * Makerules (force-install): New phony target. * Makeconfig (+force): New variable. * Makefile: Use it in dependency list of installation targets. * db/Makefile: Likewise. * db2/Makefile: Likewise. * elf/Makefile: Likewise. * hurd/Makefile: Likewise. * iconv/Makefile: Likewise. * iconvdata/Makefile: Likewise. * intl/Makefile: Likewise. * localedata/Makefile: Likewise. * login/Makefile: Likewise. * po/Makefile: Likewise. * sunrpc/Makefile: Likewise. * sysdeps/mach/hurd/Makefile: Likewise. * sysdeps/standalone/i386/force_cpu386/Makefile: Likewise. * sysdeps/unix/sysv/linux/Makefile: Likewise. * timezone/Makefile: Likewise. 1998-04-08 Andreas Schwab * sysdeps/unix/sysv/linux/getcwd.c: Use PATH_MAX as default alloc_size. Pass return value of getcwd syscall to realloc. 1998-04-08 Andreas Schwab * manual/socket.texi: Spelling fixes. 1998-04-08 Andreas Schwab * elf/dl-load.c (print_search_path): Remove unused variable. --- ChangeLog | 37 ++++++ FAQ.in | 25 ++++ Makeconfig | 9 ++ Makefile | 2 +- Makerules | 52 ++++---- config.make.in | 1 + configure | 175 ++++++++++++++------------ configure.in | 11 +- db/Makefile | 4 +- db2/Makefile | 4 +- elf/Makefile | 2 +- elf/dl-load.c | 1 - iconv/Makefile | 2 +- iconvdata/Makefile | 5 +- intl/Makefile | 2 +- localedata/Makefile | 4 +- login/Makefile | 2 +- manual/socket.texi | 10 +- po/Makefile | 2 +- sunrpc/Makefile | 4 +- sysdeps/mach/hurd/Makefile | 4 +- sysdeps/standalone/i386/force_cpu386/Makefile | 3 +- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/getcwd.c | 6 +- timezone/Makefile | 9 +- 25 files changed, 243 insertions(+), 135 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c43ac6..fad9d3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,40 @@ +1998-04-08 Andreas Schwab + + * configure.in: Add new option --enable-force-install. Substitute + force_install. + * config.make.in (force-install): Set from configure. + * Makerules (force-install): New phony target. + * Makeconfig (+force): New variable. + * Makefile: Use it in dependency list of installation targets. + * db/Makefile: Likewise. + * db2/Makefile: Likewise. + * elf/Makefile: Likewise. + * hurd/Makefile: Likewise. + * iconv/Makefile: Likewise. + * iconvdata/Makefile: Likewise. + * intl/Makefile: Likewise. + * localedata/Makefile: Likewise. + * login/Makefile: Likewise. + * po/Makefile: Likewise. + * sunrpc/Makefile: Likewise. + * sysdeps/mach/hurd/Makefile: Likewise. + * sysdeps/standalone/i386/force_cpu386/Makefile: Likewise. + * sysdeps/unix/sysv/linux/Makefile: Likewise. + * timezone/Makefile: Likewise. + +1998-04-08 Andreas Schwab + + * sysdeps/unix/sysv/linux/getcwd.c: Use PATH_MAX as default + alloc_size. Pass return value of getcwd syscall to realloc. + +1998-04-08 Andreas Schwab + + * manual/socket.texi: Spelling fixes. + +1998-04-08 Andreas Schwab + + * elf/dl-load.c (print_search_path): Remove unused variable. + 1998-04-08 Ulrich Drepper * login/utmp_file.c: use __ftruncate not ftruncate. diff --git a/FAQ.in b/FAQ.in index aee939d..adda0fb 100644 --- a/FAQ.in +++ b/FAQ.in @@ -945,6 +945,31 @@ Also, make sure you have a suitably recent kernel. As of the 970401 snapshot, according to Philip Blundell , the required kernel version is at least 2.1.30. +?? When I set the timezone I'm by setting the TZ environment variable + to EST5EDT things go wrong since glibc computes the wrong time + from this information. + +{UD} The problem is that people still use the braindamaged POSIX +method to select the timezone using the TZ environment variable with a +format EST5EDT or whatever. People, read the POSIX standard, the +implemented behaviour is correct! What you see is in fact the result +of the decisions made while POSIX.1 was created. We've only +implemented the handling of TZ this way to be POSIX compliant. It is +not really meant to be used. + +The alternative approach to handle timezones which is implemented is +the correct one to use: use the timezone database. This avoids all +the problems the POSIX method has plus it is much easier to use. +Simply run the tzselect shell script, answer the question and use the +name printed in the end by making a symlink to +/usr/share/zoneinfo/NAME (NAME is the returned value from tzselect) +from the file /etc/localtime. That's all. You never again have to +worry. + +So, please avoid sending bug reports about time related problems if +you use the POSIX method and you have not verified something is really +broken by reading the POSIX standards. + Answers were given by: {UD} Ulrich Drepper, diff --git a/Makeconfig b/Makeconfig index e2514d2..b5f5c03 100644 --- a/Makeconfig +++ b/Makeconfig @@ -497,6 +497,15 @@ ETAGS := etags -T # perhaps others) to preprocess assembly code in some cases. M4 = m4 +# To force installation of files even if they are older than the +# installed files. This variable is included in the dependency list +# of all installation targets. +ifeq ($(force-install),yes) ++force = force-install +else ++force = +endif + #### #### End of configuration variables. #### diff --git a/Makefile b/Makefile index 83b1678..7d9e98f 100644 --- a/Makefile +++ b/Makefile @@ -222,7 +222,7 @@ $(inst_includedir)/gnu/stubs.h: subdir_install ifeq (yes,$(build-shared)) -$(inst_includedir)/gnu/lib-names.h: $(common-objpfx)gnu/lib-names.h +$(inst_includedir)/gnu/lib-names.h: $(common-objpfx)gnu/lib-names.h $(+force) $(make-target-directory) if test -r $@ && cmp -s $< $@; \ then echo 'gnu/lib-names.h unchanged'; \ diff --git a/Makerules b/Makerules index 9d0a9fa..0d04b50 100644 --- a/Makerules +++ b/Makerules @@ -625,6 +625,9 @@ endef # Installation. +.PHONY: force-install +force-install: + # $(install-lib) are installed from the object directory into $(libdir); # files in $(install-lib) matching `lib%.a' are ranlib'd after installation # unless they also appear in $(non-lib.a). $(install-data) are installed @@ -660,7 +663,7 @@ installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\ $(inst_libdir)/$(patsubst %,$(libtype$o),\ $(libprefix)$(libc-name))) install: $(installed-libcs) -$(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib +$(installed-libcs): $(inst_libdir)/lib$(libprefix)%: lib $(+force) $(make-target-directory) $(INSTALL_DATA) $(common-objpfx)lib$(*:$(libc-name)%=c%) $@ # Running ranlib after installing makes the __.SYMDEF time stamp up to @@ -686,7 +689,7 @@ versioned := $(strip $(foreach so,$(install-lib.so),\ # Install all the unversioned shared libraries. $(addprefix $(inst_slibdir)/, $(filter-out $(versioned),$(install-lib.so))): \ - $(inst_slibdir)/%.so: $(objpfx)%.so; $(do-install-program) + $(inst_slibdir)/%.so: $(objpfx)%.so $(+force); $(do-install-program) ifneq ($(findstring -s,$(LN_S)),) define make-link @@ -722,9 +725,10 @@ ifdef libc.so-version # libc.so -> libc.so.N (e.g. libc.so.6) # libc.so.6 -> libc-VERSION.so (e.g. libc-1.10.so) -$(inst_slibdir)/libc.so$(libc.so-version): $(inst_slibdir)/libc-$(version).so +$(inst_slibdir)/libc.so$(libc.so-version): $(inst_slibdir)/libc-$(version).so \ + $(+force) $(make-shlib-link) -$(inst_slibdir)/libc-$(version).so: $(common-objpfx)libc.so +$(inst_slibdir)/libc-$(version).so: $(common-objpfx)libc.so $(+force) $(do-install-program) install: $(inst_slibdir)/libc.so$(libc.so-version) @@ -736,7 +740,8 @@ ifndef subdir install: $(inst_libdir)/libc.so $(inst_libdir)/libc.so: $(common-objpfx)libc.so$(libc.so-version) \ $(inst_libdir)/$(patsubst %,$(libtype.oS),\ - $(libprefix)$(libc-name)) + $(libprefix)$(libc-name)) \ + $(+force) (echo '/* GNU ld script';\ echo ' Use the shared library, but some functions are only in';\ echo ' the static library, so try that secondarily. */';\ @@ -750,7 +755,7 @@ endif else install: $(inst_slibdir)/libc.so -$(inst_slibdir)/libc.so: $(common-objpfx)libc.so +$(inst_slibdir)/libc.so: $(common-objpfx)libc.so $(+force) $(do-install-program) endif @@ -758,7 +763,7 @@ ifneq (,$(versioned)) # Produce three sets of rules as above for all the smaller versioned libraries. define o-iterator-doit -$(inst_libdir)/$o: $(inst_slibdir)/$o$($o-version); $$(make-link) +$(inst_libdir)/$o: $(inst_slibdir)/$o$($o-version) $(+force); $$(make-link) endef object-suffixes-left := $(versioned) include $(o-iterator) @@ -775,28 +780,30 @@ generated += $(foreach o,$(versioned),$o$($o-version)) ifeq (,$($(subdir)-version)) define o-iterator-doit -$(inst_slibdir)/$o$($o-version): $(inst_slibdir)/$(o:.so=)-$(version).so; +$(inst_slibdir)/$o$($o-version): $(inst_slibdir)/$(o:.so=)-$(version).so \ + $(+force); $$(make-shlib-link) endef object-suffixes-left := $(versioned) include $(o-iterator) define o-iterator-doit -$(inst_slibdir)/$(o:.so=)-$(version).so: $(objpfx)$o; $$(do-install-program) +$(inst_slibdir)/$(o:.so=)-$(version).so: $(objpfx)$o $(+force); + $$(do-install-program) endef object-suffixes-left := $(versioned) include $(o-iterator) else define o-iterator-doit $(inst_slibdir)/$o$($o-version): \ - $(inst_slibdir)/$(o:.so=)-$($(subdir)-version).so; + $(inst_slibdir)/$(o:.so=)-$($(subdir)-version).so $(+force); $$(make-shlib-link) endef object-suffixes-left := $(versioned) include $(o-iterator) define o-iterator-doit -$(inst_slibdir)/$(o:.so=)-$($(subdir)-version).so: $(objpfx)$o; +$(inst_slibdir)/$(o:.so=)-$($(subdir)-version).so: $(objpfx)$o $(+force); $$(do-install-program) endef object-suffixes-left := $(versioned) @@ -812,24 +819,27 @@ endef so-versions := $(sort $(foreach so,$(install-lib.so),.so$($(so)-version))) $(foreach v,$(so-versions),\ - $(inst_slibdir)/lib$(libprefix)%$v): $(common-objpfx)lib%.so + $(inst_slibdir)/lib$(libprefix)%$v): $(common-objpfx)lib%.so \ + $(+force) $(do-install-so) $(foreach v,$(so-versions),\ - $(inst_slibdir)/$(libprefix)%$v): $(common-objpfx)%.so + $(inst_slibdir)/$(libprefix)%$v): $(common-objpfx)%.so $(+force) $(do-install-so) endif ifdef install-bin -$(addprefix $(inst_bindir)/,$(install-bin)): $(inst_bindir)/%: $(objpfx)% +$(addprefix $(inst_bindir)/,$(install-bin)): \ + $(inst_bindir)/%: $(objpfx)% $(+force) $(do-install-program) endif ifdef install-rootsbin -$(addprefix $(inst_rootsbindir)/,$(install-rootsbin)): - $(inst_rootsbindir)/%: $(objpfx)% +$(addprefix $(inst_rootsbindir)/,$(install-rootsbin)): \ + $(inst_rootsbindir)/%: $(objpfx)% $(+force) $(do-install-program) endif ifdef install-sbin -$(addprefix $(inst_sbindir)/,$(install-sbin)): $(inst_sbindir)/%: $(objpfx)% +$(addprefix $(inst_sbindir)/,$(install-sbin)): \ + $(inst_sbindir)/%: $(objpfx)% $(+force) $(do-install-program) endif ifdef install-lib @@ -837,23 +847,23 @@ install-lib.a := $(filter lib%.a,$(install-lib)) install-lib-non.a := $(filter-out lib%.a,$(install-lib)) ifdef install-lib-non.a $(addprefix $(inst_libdir)/$(libprefix),$(install-lib-non.a)): \ - $(inst_libdir)/$(libprefix)%: $(objpfx)% + $(inst_libdir)/$(libprefix)%: $(objpfx)% $(+force) $(do-install) endif ifdef install-lib.a $(install-lib.a:lib%.a=$(inst_libdir)/lib$(libprefix)%.a): \ - $(inst_libdir)/lib$(libprefix)%.a: $(objpfx)lib%.a + $(inst_libdir)/lib$(libprefix)%.a: $(objpfx)lib%.a $(+force) $(do-install) $(patsubst %,$(RANLIB) $@,$(filter-out $(non-lib.a),$(/dev/null 2>&1; then : @@ -796,7 +810,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:800: checking host system type" >&5 +echo "configure:814: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -919,7 +933,7 @@ fi # This can take a while to compute. sysdep_dir=$srcdir/sysdeps echo $ac_n "checking sysdep dirs""... $ac_c" 1>&6 -echo "configure:923: checking sysdep dirs" >&5 +echo "configure:937: checking sysdep dirs" >&5 # Make sco3.2v4 become sco3.2.4 and sunos4.1.1_U1 become sunos4.1.1.U1. os="`echo $os | sed 's/\([0-9A-Z]\)[v_]\([0-9A-Z]\)/\1.\2/g'`" @@ -1124,7 +1138,7 @@ echo "$ac_t""sysdeps/generic" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1128: checking for a BSD compatible install" >&5 +echo "configure:1142: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1178,7 +1192,7 @@ if test "$INSTALL" = "${srcdir}/install-sh -c"; then INSTALL='\$(..)./install-sh -c' fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1182: checking whether ln -s works" >&5 +echo "configure:1196: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1201,7 +1215,7 @@ fi # These programs are version sensitive. echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1205: checking build system type" >&5 +echo "configure:1219: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1229,7 +1243,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1233: checking for $ac_word" >&5 +echo "configure:1247: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1262,7 +1276,7 @@ if test -z "$CC"; then else # Found it, now check the version. echo $ac_n "checking version of $CC""... $ac_c" 1>&6 -echo "configure:1266: checking version of $CC" >&5 +echo "configure:1280: checking version of $CC" >&5 ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcst0-9.-]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -1282,7 +1296,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1286: checking for $ac_word" >&5 +echo "configure:1300: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1315,7 +1329,7 @@ if test -z "$MAKE"; then else # Found it, now check the version. echo $ac_n "checking version of $MAKE""... $ac_c" 1>&6 -echo "configure:1319: checking version of $MAKE" >&5 +echo "configure:1333: checking version of $MAKE" >&5 ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*version \([0-9][0-9.]*\), by.*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -1336,7 +1350,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1340: checking for $ac_word" >&5 +echo "configure:1354: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1369,7 +1383,7 @@ if test -z "$MSGFMT"; then else # Found it, now check the version. echo $ac_n "checking version of $MSGFMT""... $ac_c" 1>&6 -echo "configure:1373: checking version of $MSGFMT" >&5 +echo "configure:1387: checking version of $MSGFMT" >&5 ac_prog_version=`$MSGFMT --version 2>&1 | sed -n 's/^.*GNU gettext.*\([0-9][0-9]*\.[0-9]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -1389,7 +1403,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1393: checking for $ac_word" >&5 +echo "configure:1407: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1422,7 +1436,7 @@ if test -z "$MAKEINFO"; then else # Found it, now check the version. echo $ac_n "checking version of $MAKEINFO""... $ac_c" 1>&6 -echo "configure:1426: checking version of $MAKEINFO" >&5 +echo "configure:1440: checking version of $MAKEINFO" >&5 ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo \([0-9][0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -1451,7 +1465,7 @@ test -n "$aux_missing" && echo "configure: warning: echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1455: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1469: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1464,11 +1478,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1493,7 +1507,7 @@ else cross_linkable=yes fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1497: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1511: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_cross'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1505,7 +1519,7 @@ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1509: checking whether we are using GNU C" >&5 +echo "configure:1523: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1514,7 +1528,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1527,7 +1541,7 @@ if test $ac_cv_prog_gcc != yes; then fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1531: checking build system type" >&5 +echo "configure:1545: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1550,7 +1564,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1554: checking for $ac_word" >&5 +echo "configure:1568: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BUILD_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1581,7 +1595,7 @@ done fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1585: checking how to run the C preprocessor" >&5 +echo "configure:1599: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1596,13 +1610,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1613,13 +1627,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1652,7 +1666,7 @@ LD=`$CC -print-prog-name=ld` # Determine whether we are using GNU binutils. echo $ac_n "checking whether $AS is GNU as""... $ac_c" 1>&6 -echo "configure:1656: checking whether $AS is GNU as" >&5 +echo "configure:1670: checking whether $AS is GNU as" >&5 if eval "test \"`echo '$''{'libc_cv_prog_as_gnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1670,7 +1684,7 @@ rm -f a.out gnu_as=$libc_cv_prog_as_gnu echo $ac_n "checking whether $LD is GNU ld""... $ac_c" 1>&6 -echo "configure:1674: checking whether $LD is GNU ld" >&5 +echo "configure:1688: checking whether $LD is GNU ld" >&5 if eval "test \"`echo '$''{'libc_cv_prog_ld_gnu'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1689,7 +1703,7 @@ gnu_ld=$libc_cv_prog_ld_gnu # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1693: checking for $ac_word" >&5 +echo "configure:1707: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1720,7 +1734,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1724: checking for $ac_word" >&5 +echo "configure:1738: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1751,7 +1765,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1755: checking for $ac_word" >&5 +echo "configure:1769: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1785,7 +1799,7 @@ fi # Extract the first word of "${ac_tool_prefix}mig", so it can be a program name with args. set dummy ${ac_tool_prefix}mig; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1789: checking for $ac_word" >&5 +echo "configure:1803: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1825,7 +1839,7 @@ fi # check if ar takes S echo $ac_n "checking for ar S""... $ac_c" 1>&6 -echo "configure:1829: checking for ar S" >&5 +echo "configure:1843: checking for ar S" >&5 if eval "test \"`echo '$''{'libc_cv_ar_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1833,7 +1847,7 @@ else tmplib=lib$$.a rm -f $tmpo $tmplib touch $tmpo -if { ac_try='${AR-ar} rcuS $tmplib $tmpo > /dev/null 2>&1'; { (eval echo configure:1837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then +if { ac_try='${AR-ar} rcuS $tmplib $tmpo > /dev/null 2>&1'; { (eval echo configure:1851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_ar_S=yes else libc_cv_ar_S=no @@ -1851,7 +1865,7 @@ echo "$ac_t""$libc_cv_ar_S" 1>&6 # - two terminals occur directly after each other # - the path contains an element with a dot in it echo $ac_n "checking LD_LIBRARY_PATH variable""... $ac_c" 1>&6 -echo "configure:1855: checking LD_LIBRARY_PATH variable" >&5 +echo "configure:1869: checking LD_LIBRARY_PATH variable" >&5 case ${LD_LIBRARY_PATH} in [:\;]* | *[:\;] | *[:\;][:\;]* | *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* ) ld_library_path_setting="contains current directory" @@ -1871,7 +1885,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1875: checking for $ac_word" >&5 +echo "configure:1889: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1913,7 +1927,7 @@ if test "$BASH" = no; then # Extract the first word of "ksh", so it can be a program name with args. set dummy ksh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1917: checking for $ac_word" >&5 +echo "configure:1931: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_KSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1959,7 +1973,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1963: checking for $ac_word" >&5 +echo "configure:1977: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1994,7 +2008,7 @@ test -n "$PERL" || PERL="no" echo $ac_n "checking for signed size_t type""... $ac_c" 1>&6 -echo "configure:1998: checking for signed size_t type" >&5 +echo "configure:2012: checking for signed size_t type" >&5 if eval "test \"`echo '$''{'libc_cv_signed_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2018,12 +2032,12 @@ EOF fi echo $ac_n "checking for libc-friendly stddef.h""... $ac_c" 1>&6 -echo "configure:2022: checking for libc-friendly stddef.h" >&5 +echo "configure:2036: checking for libc-friendly stddef.h" >&5 if eval "test \"`echo '$''{'libc_cv_friendly_stddef'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_friendly_stddef=yes else @@ -2057,7 +2071,7 @@ override stddef.h = # The installed seems to be libc-friendly." fi echo $ac_n "checking whether we need to use -P to assemble .S files""... $ac_c" 1>&6 -echo "configure:2061: checking whether we need to use -P to assemble .S files" >&5 +echo "configure:2075: checking whether we need to use -P to assemble .S files" >&5 if eval "test \"`echo '$''{'libc_cv_need_minus_P'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2080,7 +2094,7 @@ asm-CPPFLAGS = -P # The assembler can't grok cpp's # line directives." fi echo $ac_n "checking for assembler global-symbol directive""... $ac_c" 1>&6 -echo "configure:2084: checking for assembler global-symbol directive" >&5 +echo "configure:2098: checking for assembler global-symbol directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_global_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2110,7 +2124,7 @@ EOF fi echo $ac_n "checking for .set assembler directive""... $ac_c" 1>&6 -echo "configure:2114: checking for .set assembler directive" >&5 +echo "configure:2128: checking for .set assembler directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_set_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2144,7 +2158,7 @@ EOF fi echo $ac_n "checking for .symver assembler directive""... $ac_c" 1>&6 -echo "configure:2148: checking for .symver assembler directive" >&5 +echo "configure:2162: checking for .symver assembler directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_symver_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2163,7 +2177,7 @@ fi echo "$ac_t""$libc_cv_asm_symver_directive" 1>&6 echo $ac_n "checking for ld --version-script""... $ac_c" 1>&6 -echo "configure:2167: checking for ld --version-script" >&5 +echo "configure:2181: checking for ld --version-script" >&5 if eval "test \"`echo '$''{'libc_cv_ld_version_script_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2186,7 +2200,7 @@ EOF if { ac_try='${CC-cc} $CFLAGS -shared -o conftest.so conftest.o -nostartfiles -nostdlib -Wl,--version-script,conftest.map - 1>&5'; { (eval echo configure:2190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; + 1>&5'; { (eval echo configure:2204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_ld_version_script_option=yes else @@ -2224,7 +2238,7 @@ if test $VERSIONING = no; then fi if test $elf = yes; then echo $ac_n "checking for .previous assembler directive""... $ac_c" 1>&6 -echo "configure:2228: checking for .previous assembler directive" >&5 +echo "configure:2242: checking for .previous assembler directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_previous_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2232,7 +2246,7 @@ else .section foo_section .previous EOF - if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:2236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:2250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_asm_previous_directive=yes else libc_cv_asm_previous_directive=no @@ -2248,7 +2262,7 @@ EOF else echo $ac_n "checking for .popsection assembler directive""... $ac_c" 1>&6 -echo "configure:2252: checking for .popsection assembler directive" >&5 +echo "configure:2266: checking for .popsection assembler directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_popsection_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2256,7 +2270,7 @@ else .pushsection foo_section .popsection EOF - if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:2260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'; { (eval echo configure:2274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_asm_popsection_directive=yes else libc_cv_asm_popsection_directive=no @@ -2276,12 +2290,12 @@ fi if test $elf != yes; then echo $ac_n "checking for .init and .fini sections""... $ac_c" 1>&6 -echo "configure:2280: checking for .init and .fini sections" >&5 +echo "configure:2294: checking for .init and .fini sections" >&5 if eval "test \"`echo '$''{'libc_cv_have_initfini'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_have_initfini=yes else @@ -2318,19 +2332,19 @@ if test $elf = yes; then else if test $ac_cv_prog_cc_works = yes; then echo $ac_n "checking for _ prefix on C symbol names""... $ac_c" 1>&6 -echo "configure:2322: checking for _ prefix on C symbol names" >&5 +echo "configure:2336: checking for _ prefix on C symbol names" >&5 if eval "test \"`echo '$''{'libc_cv_asm_underscores'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* libc_cv_asm_underscores=yes else @@ -2345,17 +2359,17 @@ fi echo "$ac_t""$libc_cv_asm_underscores" 1>&6 else echo $ac_n "checking for _ prefix on C symbol names""... $ac_c" 1>&6 -echo "configure:2349: checking for _ prefix on C symbol names" >&5 +echo "configure:2363: checking for _ prefix on C symbol names" >&5 if eval "test \"`echo '$''{'libc_cv_asm_underscores'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if grep _underscore_test conftest* >/dev/null; then rm -f conftest* libc_cv_asm_underscores=yes @@ -2387,7 +2401,7 @@ if test $elf = yes; then fi echo $ac_n "checking for assembler .weak directive""... $ac_c" 1>&6 -echo "configure:2391: checking for assembler .weak directive" >&5 +echo "configure:2405: checking for assembler .weak directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_weak_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2410,7 +2424,7 @@ echo "$ac_t""$libc_cv_asm_weak_directive" 1>&6 if test $libc_cv_asm_weak_directive = no; then echo $ac_n "checking for assembler .weakext directive""... $ac_c" 1>&6 -echo "configure:2414: checking for assembler .weakext directive" >&5 +echo "configure:2428: checking for assembler .weakext directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_weakext_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2448,7 +2462,7 @@ EOF fi echo $ac_n "checking for ld --no-whole-archive""... $ac_c" 1>&6 -echo "configure:2452: checking for ld --no-whole-archive" >&5 +echo "configure:2466: checking for ld --no-whole-archive" >&5 if eval "test \"`echo '$''{'libc_cv_ld_no_whole_archive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2459,7 +2473,7 @@ __throw () {} EOF if { ac_try='${CC-cc} $CFLAGS -nostdlib -nostartfiles -Wl,--no-whole-archive - -o conftest conftest.c 1>&5'; { (eval echo configure:2463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + -o conftest conftest.c 1>&5'; { (eval echo configure:2477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_ld_no_whole_archive=yes else libc_cv_ld_no_whole_archive=no @@ -2470,7 +2484,7 @@ fi echo "$ac_t""$libc_cv_ld_no_whole_archive" 1>&6 echo $ac_n "checking for gcc -fno-exceptions""... $ac_c" 1>&6 -echo "configure:2474: checking for gcc -fno-exceptions" >&5 +echo "configure:2488: checking for gcc -fno-exceptions" >&5 if eval "test \"`echo '$''{'libc_cv_gcc_no_exceptions'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2481,7 +2495,7 @@ __throw () {} EOF if { ac_try='${CC-cc} $CFLAGS -nostdlib -nostartfiles -fno-exceptions - -o conftest conftest.c 1>&5'; { (eval echo configure:2485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + -o conftest conftest.c 1>&5'; { (eval echo configure:2499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_gcc_no_exceptions=yes else libc_cv_gcc_no_exceptions=no @@ -2493,14 +2507,14 @@ echo "$ac_t""$libc_cv_gcc_no_exceptions" 1>&6 if test "$base_machine" = alpha ; then echo $ac_n "checking for function ..ng prefix""... $ac_c" 1>&6 -echo "configure:2497: checking for function ..ng prefix" >&5 +echo "configure:2511: checking for function ..ng prefix" >&5 if eval "test \"`echo '$''{'libc_cv_gcc_alpha_ng_prefix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.c <<\EOF foo () { } EOF -if { ac_try='${CC-cc} -S conftest.c -o - | fgrep "\$foo..ng" > /dev/null'; { (eval echo configure:2504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; +if { ac_try='${CC-cc} -S conftest.c -o - | fgrep "\$foo..ng" > /dev/null'; { (eval echo configure:2518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_gcc_alpha_ng_prefix=yes else @@ -2524,12 +2538,12 @@ fi fi echo $ac_n "checking for DWARF2 unwind info support""... $ac_c" 1>&6 -echo "configure:2528: checking for DWARF2 unwind info support" >&5 +echo "configure:2542: checking for DWARF2 unwind info support" >&5 if eval "test \"`echo '$''{'libc_cv_gcc_dwarf2_unwind_info'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.c <&5; (eval $ac_try) 2>&5; }; }; then + -o conftest conftest.c -lgcc >&5'; { (eval echo configure:2574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_gcc_dwarf2_unwind_info=static else libc_cv_gcc_dwarf2_unwind_info=no @@ -2564,7 +2578,7 @@ fi if test $libc_cv_gcc_dwarf2_unwind_info = no; then if { ac_try='${CC-cc} $CFLAGS -DCHECK__register_frame -nostdlib -nostartfiles - -o conftest conftest.c -lgcc >&5'; { (eval echo configure:2568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + -o conftest conftest.c -lgcc >&5'; { (eval echo configure:2582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_gcc_dwarf2_unwind_info=yes else libc_cv_gcc_dwarf2_unwind_info=no @@ -2638,7 +2652,7 @@ if test "$uname" = "sysdeps/generic"; then fi echo $ac_n "checking OS release for uname""... $ac_c" 1>&6 -echo "configure:2642: checking OS release for uname" >&5 +echo "configure:2656: checking OS release for uname" >&5 if eval "test \"`echo '$''{'libc_cv_uname_release'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2660,7 +2674,7 @@ echo "$ac_t""$libc_cv_uname_release" 1>&6 uname_release="$libc_cv_uname_release" echo $ac_n "checking OS version for uname""... $ac_c" 1>&6 -echo "configure:2664: checking OS version for uname" >&5 +echo "configure:2678: checking OS version for uname" >&5 if eval "test \"`echo '$''{'libc_cv_uname_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2682,7 +2696,7 @@ else fi echo $ac_n "checking stdio selection""... $ac_c" 1>&6 -echo "configure:2686: checking stdio selection" >&5 +echo "configure:2700: checking stdio selection" >&5 case $stdio in libio) cat >> confdefs.h <<\EOF @@ -2694,7 +2708,7 @@ esac echo "$ac_t""$stdio" 1>&6 echo $ac_n "checking ldap selection""... $ac_c" 1>&6 -echo "configure:2698: checking ldap selection" >&5 +echo "configure:2712: checking ldap selection" >&5 case $add_ons in *ldap*) @@ -2757,7 +2771,7 @@ if test $static = no && test $shared = yes; then fi echo $ac_n "checking whether -fPIC is default""... $ac_c" 1>&6 -echo "configure:2761: checking whether -fPIC is default" >&5 +echo "configure:2775: checking whether -fPIC is default" >&5 if eval "test \"`echo '$''{'pic_default'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2926,6 +2940,7 @@ s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@with_cvs@%$with_cvs%g s%@subdirs@%$subdirs%g +s%@force_install@%$force_install%g s%@host@%$host%g s%@host_alias@%$host_alias%g s%@host_cpu@%$host_cpu%g diff --git a/configure.in b/configure.in index 44cde5c..6d17bb3 100644 --- a/configure.in +++ b/configure.in @@ -91,8 +91,9 @@ AC_ARG_ENABLE(versioning, dnl dnl Generic infrastructure for drop-in additions to libc. AC_ARG_ENABLE(add-ons, dnl -[ --enable-add-ons[=DIR1,DIR2]... configure and build add-ons in DIR1,DIR2,... - search for add-ons if no parameter given], +[ --enable-add-ons[=DIR1,DIR2]... + configure and build add-ons in DIR1,DIR2,... + search for add-ons if no parameter given], [case "$enableval" in yes) if test "$srcdir" = "."; then add_ons=`echo */configure | sed -e 's!/configure!!g'` @@ -126,6 +127,12 @@ if test x"$static_nss" = xyes; then AC_DEFINE(DO_STATIC_NSS) fi +AC_ARG_ENABLE(force-install, +[ --enable-force-install force installation of files from this package, + even if they are older than the installed files], + force_install=$enableval, force_install=yes) +AC_SUBST(force_install) + AC_CANONICAL_HOST # The way shlib-versions is used to generate soversions.mk uses a diff --git a/db/Makefile b/db/Makefile index 2d742d1..e9817e2 100644 --- a/db/Makefile +++ b/db/Makefile @@ -53,11 +53,11 @@ endif $(objpfx)libdb.so: $(common-objpfx)libc.so subdir_install: $(inst_libdir)/libndbm.a -$(inst_libdir)/libndbm.a: $(inst_libdir)/libdb.a +$(inst_libdir)/libndbm.a: $(inst_libdir)/libdb.a $(+force) $(make-link) ifeq ($(build-shared),yes) subdir_install: $(inst_libdir)/libndbm.so -$(inst_libdir)/libndbm.so: $(inst_libdir)/libdb.so +$(inst_libdir)/libndbm.so: $(inst_libdir)/libdb.so $(+force) $(make-link) endif diff --git a/db2/Makefile b/db2/Makefile index 2d95bd7..594b802 100644 --- a/db2/Makefile +++ b/db2/Makefile @@ -112,11 +112,11 @@ endif $(objpfx)libdb.so: $(common-objpfx)libc.so subdir_install: $(inst_libdir)/libndbm.a -$(inst_libdir)/libndbm.a: $(inst_libdir)/libdb.a +$(inst_libdir)/libndbm.a: $(inst_libdir)/libdb.a $(+force) $(make-link) ifeq ($(build-shared),yes) subdir_install: $(inst_libdir)/libndbm.so -$(inst_libdir)/libndbm.so: $(inst_libdir)/libdb.so +$(inst_libdir)/libndbm.so: $(inst_libdir)/libdb.so $(+force) $(make-link) endif diff --git a/elf/Makefile b/elf/Makefile index 70b0c6a..8ad8d98 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -155,7 +155,7 @@ CFLAGS-dl-load.c += -Wno-uninitialized # rule to build a shared library. $(objpfx)libdl.so: $(objpfx)libdl_pic.a $(common-objpfx)libc.so $(objpfx)ld.so -$(inst_slibdir)/$(rtld-version-installed-name): $(objpfx)ld.so +$(inst_slibdir)/$(rtld-version-installed-name): $(objpfx)ld.so $(+force) $(do-install-program) $(inst_slibdir)/$(rtld-installed-name): \ diff --git a/elf/dl-load.c b/elf/dl-load.c index edaa2cc..c3337e4 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -830,7 +830,6 @@ print_search_path (struct r_search_path_elem **list, const char *what, const char *name) { char buf[max_dirnamelen + max_capstrlen]; - char *endp; int first = 1; _dl_debug_message (1, " search path=", NULL); diff --git a/iconv/Makefile b/iconv/Makefile index afe48d9..783b1d5 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -35,5 +35,5 @@ include ../Rules subdir_install: $(inst_bindir)/iconv -$(inst_bindir)/iconv: $(objpfx)iconv_prog +$(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force) $(do-install-program) diff --git a/iconvdata/Makefile b/iconvdata/Makefile index cd635d8..f549091 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -184,9 +184,10 @@ endif headers: $(sed-generated-headers) $(perl-generated-headers) -$(addprefix $(inst_gconvdir)/, $(modules.so)): $(inst_gconvdir)/%: $(objpfx)% +$(addprefix $(inst_gconvdir)/, $(modules.so)): \ + $(inst_gconvdir)/%: $(objpfx)% $(+force) $(do-install-program) -$(inst_gconvdir)/gconv-modules: gconv-modules +$(inst_gconvdir)/gconv-modules: gconv-modules $(+force) $(do-install) endif diff --git a/intl/Makefile b/intl/Makefile index 9ee9ba4..c6d58da 100644 --- a/intl/Makefile +++ b/intl/Makefile @@ -32,7 +32,7 @@ include ../Rules CPPFLAGS += -D'GNULOCALEDIR="$(localedir)"' \ -D'LOCALE_ALIAS_PATH="$(localedir):$(i18ndir)"' -$(inst_localedir)/locale.alias: locale.alias +$(inst_localedir)/locale.alias: locale.alias $(+force) $(do-install) ifdef gettext-srcdir diff --git a/localedata/Makefile b/localedata/Makefile index dac6620..25dde67 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -55,8 +55,8 @@ install-others := $(addprefix $(inst_i18ndir)/, $(charmaps) $(locales)) include ../Rules # Install the source files in the appropriate directories. -$(inst_i18ndir)/charmaps/%: charmaps/%; $(do-install) -$(inst_i18ndir)/locales/%: locales/%; $(do-install) +$(inst_i18ndir)/charmaps/%: charmaps/% $(+force); $(do-install) +$(inst_i18ndir)/locales/%: locales/% $(+force); $(do-install) ifeq (no,$(cross-compiling)) diff --git a/login/Makefile b/login/Makefile index e203e9a..5f7861b 100644 --- a/login/Makefile +++ b/login/Makefile @@ -53,7 +53,7 @@ libutil-map := libutil.map include ../Rules # pt_chown needs to be setuid root. -$(inst_libexecdir)/pt_chown: $(objpfx)pt_chown +$(inst_libexecdir)/pt_chown: $(objpfx)pt_chown $(+force) $(make-target-directory) -$(INSTALL) -m 4755 -o root $< $@ diff --git a/manual/socket.texi b/manual/socket.texi index 954d598..025abcf 100644 --- a/manual/socket.texi +++ b/manual/socket.texi @@ -656,7 +656,7 @@ the file name string. This can be done using the macro @code{SUN_LEN}: @comment sys/un.h @comment BSD -@deftypefn {Macro} int SUNLEN (@emph{struct sockaddr_un *} @var{ptr}) +@deftypefn {Macro} int SUN_LEN (@emph{struct sockaddr_un *} @var{ptr}) The macro computes the length of socket address in the local namespace. @end deftypefn @@ -921,7 +921,7 @@ example the class A network 10 is written as @samp{10.0.0.0/8}. IPv6 addresses contain 128 bits (IPv4 has 32 bits) of data. A host address is usually written as eight 16-bit hexadecimal numbers that are -separated by colons. Two colons are used to appreviated strings of +separated by colons. Two colons are used to abbreviate strings of consecutive zeros. For example the IPv6 loopback address which is @samp{0:0:0:0:0:0:0:1} can be just written as @samp{::1}. @@ -1056,7 +1056,7 @@ given in the standard numbers-and-dots notation. The returned address is in host order. If the input is not valid, @code{inet_network} returns @code{-1}. -The function works only with traditional IPv4 class A,B and C network +The function works only with traditional IPv4 class A, B and C network types. It doesn't work with classless addresses and shouldn't be used anymore. @end deftypefun @@ -1093,7 +1093,7 @@ number @var{net} with the local-address-within-network number This function returns the local-address-within-network part of the Internet host address @var{addr}. -The function works only with traditional IPv4 class A,B and C network +The function works only with traditional IPv4 class A, B and C network types. It doesn't work with classless addresses and shouldn't be used anymore. @end deftypefun @@ -1104,7 +1104,7 @@ anymore. This function returns the network number part of the Internet host address @var{addr}. -The function works only with traditional IPv4 class A,B and C network +The function works only with traditional IPv4 class A, B and C network types. It doesn't work with classless addresses and shouldn't be used anymore. @end deftypefun diff --git a/po/Makefile b/po/Makefile index 4056201..e1a5314 100644 --- a/po/Makefile +++ b/po/Makefile @@ -59,7 +59,7 @@ include ../Rules $(MSGFMT) -o $@ $< # Install the message object files as libc.po in the language directory. -$(mo-installed): %.mo; $(do-install) || exit 0 +$(mo-installed): %.mo $(+force); $(do-install) || exit 0 .PHONY: linguas linguas.mo linguas: $(ALL_LINGUAS:=.po) diff --git a/sunrpc/Makefile b/sunrpc/Makefile index c0c9288..25a62a2 100644 --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -124,12 +124,12 @@ rpcgen-cmd = $(built-program-cmd) # a shorter name. But if the filesystem can handle it, we want to # install under the proper name as well. $(inst_includedir)/rpcsvc/bootparam_prot.h: \ - $(inst_includedir)/rpcsvc/bootparam.h + $(inst_includedir)/rpcsvc/bootparam.h $(+force) @echo It is safe to ignore an error here if this file name is too long. -$(do-install) # Install the rpc data base file. -$(inst_sysconfdir)/rpc: etc.rpc +$(inst_sysconfdir)/rpc: etc.rpc $(+force) $(do-install) # Generate the rpcsvc headers with rpcgen. diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index 9f1ce74..454ac8f 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -106,8 +106,8 @@ libc-name = crt ifeq (,$(subdir)) install-others += $(inst_libdir)/libc.a $(inst_libdir)/libc_p.a -$(inst_libdir)/libc.a: $(hurd)/libc-ldscript; $(do-install) -$(inst_libdir)/libc_p.a: $(hurd)/libc_p-ldscript; $(do-install) +$(inst_libdir)/libc.a: $(hurd)/libc-ldscript $(+force); $(do-install) +$(inst_libdir)/libc_p.a: $(hurd)/libc_p-ldscript $(+force); $(do-install) endif # Make sure these are used to build the libc.so shared object too. diff --git a/sysdeps/standalone/i386/force_cpu386/Makefile b/sysdeps/standalone/i386/force_cpu386/Makefile index a51ed7f..3ed0964 100644 --- a/sysdeps/standalone/i386/force_cpu386/Makefile +++ b/sysdeps/standalone/i386/force_cpu386/Makefile @@ -20,6 +20,7 @@ ifeq (bare,$(subdir)) install-others += $(inst_libdir)/force_cpu386.ld -$(inst_libdir)/force_cpu386.ld: $(sysdep_dir)/standalone/i386/target.ld +$(inst_libdir)/force_cpu386.ld: $(sysdep_dir)/standalone/i386/target.ld \ + $(+force) $(do-install) endif diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 9abab1e..3d52210 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -37,7 +37,7 @@ $(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/sys/syscal } > $(@:.d=.h).new mv -f $(@:.d=.h).new $(@:.d=.h) -$(inst_includedir)/bits/syscall.h: $(objpfx)syscall-list.h +$(inst_includedir)/bits/syscall.h: $(objpfx)syscall-list.h $(+force) $(make-target-directory) if test -r $@ && cmp -s $< $@; \ then echo 'bits/syscall.h unchanged'; \ diff --git a/sysdeps/unix/sysv/linux/getcwd.c b/sysdeps/unix/sysv/linux/getcwd.c index b34960e..19a2c0f 100644 --- a/sysdeps/unix/sysv/linux/getcwd.c +++ b/sysdeps/unix/sysv/linux/getcwd.c @@ -64,7 +64,7 @@ __getcwd (char *buf, size_t size) return NULL; } - alloc_size = PATH_MAX + 1; + alloc_size = PATH_MAX; } if (buf != NULL) @@ -88,9 +88,9 @@ __getcwd (char *buf, size_t size) { if (buf == NULL) { - buf = realloc (path, strlen (path) + 1); + buf = realloc (path, (size_t) retval); if (buf == NULL) - /* `relloc' failed but we still have the original string. */ + /* `realloc' failed but we still have the original string. */ buf = path; } return buf; diff --git a/timezone/Makefile b/timezone/Makefile index fc8b598..3d05109 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -136,7 +136,8 @@ target-zone-flavor = $(filter /posix /right, \ $(patsubst $(inst_zonedir)/%,%,$@)))) ifdef localtime -$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic +$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \ + $(+force) $(make-target-directory) if test -r $@; then \ echo Site timezone NOT reset to Factory.; \ @@ -147,7 +148,8 @@ $(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic fi endif ifdef posixrules -$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic +$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic \ + $(+force) $(zic-cmd) -p $(posixrules) endif @@ -188,5 +190,6 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make chmod 555 $@.new mv -f $@.new $@ -$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): $(inst_zonedir)/%: % +$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): \ + $(inst_zonedir)/%: % $(+force) $(do-install) -- cgit v1.1