summaryrefslogtreecommitdiff
path: root/glibc/glibc-cvs/ldconfig.patch
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
committerChris Larson <clarson@kergoth.com>2004-12-09 09:47:41 +0000
commit2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch)
treebf879bea7ef8517ba8c3d1286ef300401d3d484c /glibc/glibc-cvs/ldconfig.patch
parent101e2f1623def0a355d20aacb8bd93810703e834 (diff)
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'glibc/glibc-cvs/ldconfig.patch')
-rw-r--r--glibc/glibc-cvs/ldconfig.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/glibc/glibc-cvs/ldconfig.patch b/glibc/glibc-cvs/ldconfig.patch
deleted file mode 100644
index c60b9b1432..0000000000
--- a/glibc/glibc-cvs/ldconfig.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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;