diff options
| author | Chris Larson <clarson@kergoth.com> | 2003-12-19 22:31:24 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2003-12-19 22:31:24 +0000 |
| commit | 5496e81f106aefb7ad2e9bed4ee898a1e3f8d9be (patch) | |
| tree | d930d5d96991aeb12b53bda5ebc265b86fc7bfa0 /glibc/glibc-2.3.2/ldconfig.patch | |
| parent | 4c0bfe156e42601fe75fcdfb6e36d4e6b7197451 (diff) | |
Fixups for the glibc build. Install the kernel headers into sys-include in glibc-initial as well as glibc to fix a problem with building an i386-linux crosscompiler. Also import a newer glibc 2.3.2 patchset from debian
's package pool.
BKrev: 3fe37c3cgArHHqFEDVnEZyqfCf4ovQ
Diffstat (limited to 'glibc/glibc-2.3.2/ldconfig.patch')
| -rw-r--r-- | glibc/glibc-2.3.2/ldconfig.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/glibc/glibc-2.3.2/ldconfig.patch b/glibc/glibc-2.3.2/ldconfig.patch index e69de29bb2..c60b9b1432 100644 --- a/glibc/glibc-2.3.2/ldconfig.patch +++ b/glibc/glibc-2.3.2/ldconfig.patch @@ -0,0 +1,37 @@ +--- elf/ldconfig.c 2003-07-08 23:26:27.000000000 +0900 ++++ elf/ldconfig.c.debian 2003-07-08 23:29:43.000000000 +0900 +@@ -920,26 +920,24 @@ + { + FILE *file = NULL; + char *line = NULL; +- const char *canon; ++ const char *canon = filename; + size_t len = 0; ++ int file_fd; + + if (opt_chroot) + { + canon = chroot_canon (opt_chroot, filename); +- if (canon) +- file = fopen (canon, "r"); +- else ++ if (!canon) + canon = filename; + } +- else +- { +- canon = filename; +- file = fopen (filename, "r"); +- } ++ ++ if ((file_fd = open(canon, O_RDONLY | O_EXCL, 0022)) != -1) ++ file = fdopen (file_fd, "r"); + + if (file == NULL) + { +- error (0, errno, _("Can't open configuration file %s"), canon); ++ if (opt_verbose) ++ error (0, errno, _("Can't open configuration file %s"), canon); + if (canon != filename) + free ((char *) canon); + return; |