diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-11-26 08:16:33 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-11-26 08:16:33 +0000 |
| commit | 28f367c4e3da4bd7515d11390514dbf2b751eda9 (patch) | |
| tree | 9b7d054c4707f0528f80eaf7d46e26c84e9f0b67 /posix/Makefile | |
| parent | 90692538658ce0c42abacb0c053c7e88bc5d649d (diff) | |
| download | glibc-28f367c4e3da4bd7515d11390514dbf2b751eda9.tar.gz glibc-28f367c4e3da4bd7515d11390514dbf2b751eda9.tar.xz glibc-28f367c4e3da4bd7515d11390514dbf2b751eda9.zip | |
Update.
* posix/Makefile (install-others): Add $(inst_libexecdir)/getconf.
(CFLAGS-sysconf.c): Add -D_GETCONF_DIR.
(CFLAGS-getconf.c): New.
($(inst_libexecdir)/getconf): New.
* posix/confstr.c (confstr): Use __sysconf to query specifications
that don't have _POSIX_V6_* macros defined. Use __*_{C,LD}FLAGS
macros defined in bits/environments.h.
* sysdeps/posix/sysconf.c: Include stdlib.h, string.h and
sys/stat.h.
(__sysconf_check_spec): New routine.
(__sysconf): Use it.
* posix/getconf.c (specs): Change into structure array.
(main): If -v is not given, try to get default from
$(libexecdir)/getconf/default. If specification is not
supported by this getconf, try to execute
$(libexecdir)/getconf/$(specification).
* sysdeps/unix/bsd/bsd4.4/freebsd/bits/environments.h: New file.
* sysdeps/unix/sysv/linux/s390/bits/environments.h: New file.
* sysdeps/unix/sysv/linux/powerpc/bits/environments.h: New file.
* sysdeps/unix/sysv/linux/sparc/bits/environments.h: New file.
* sysdeps/unix/sysv/linux/i386/bits/environments.h: New file.
* sysdeps/unix/sysv/linux/x86_64/bits/environments.h: New file.
* sysdeps/generic/bits/environments.h (__ILP32_OFFBIG_CFLAGS):
Define.
2004-11-26 Jakub Jelinek <jakub@redhat.com>
Diffstat (limited to 'posix/Makefile')
| -rw-r--r-- | posix/Makefile | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/posix/Makefile b/posix/Makefile index c89cfc0b41..faee4bbd54 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -91,6 +91,7 @@ tests += wordexp-test tst-exec tst-spawn endif others := getconf install-bin := getconf +install-others := $(inst_libexecdir)/getconf before-compile := testcases.h ptestcases.h @@ -138,7 +139,7 @@ CFLAGS-waitid.c = -fexceptions CFLAGS-waitpid.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-getopt.c = -fexceptions CFLAGS-wordexp.c = -fexceptions -CFLAGS-sysconf.c = -fexceptions +CFLAGS-sysconf.c = -fexceptions -DGETCONF_DIR='"$(libexecdir)/getconf"' CFLAGS-pathconf.c = -fexceptions CFLAGS-fpathconf.c = -fexceptions CFLAGS-spawn.c = -fexceptions @@ -147,6 +148,7 @@ CFLAGS-spawni.c = -fexceptions CFLAGS-pause.c = -fexceptions CFLAGS-glob.c = $(uses-callbacks) -fexceptions CFLAGS-glob64.c = $(uses-callbacks) -fexceptions +CFLAGS-getconf.c = -DGETCONF_DIR='"$(libexecdir)/getconf"' tstgetopt-ARGS = -a -b -cfoobar --required foobar --optional=bazbug \ --none random --col --color --colour @@ -260,3 +262,13 @@ bug-glob2-ENV = MALLOC_TRACE=$(objpfx)bug-glob2.mtrace $(objpfx)bug-glob2-mem: $(objpfx)bug-glob2.out $(common-objpfx)malloc/mtrace $(objpfx)bug-glob2.mtrace > $@ + +$(inst_libexecdir)/getconf: $(objpfx)getconf FORCE + $(addprefix $(..)./scripts/mkinstalldirs ,\ + $(filter-out $(wildcard $@),$@)) + for spec in `LC_ALL=C GETCONF_DIR=/dev/null \ + $(run-program-prefix) $< \ + _POSIX_V6_WIDTH_RESTRICTED_ENVS`; do \ + $(INSTALL_PROGRAM) $< $@/$$spec.new; \ + mv -f $@/$$spec.new $@/$$spec; \ + done |