This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
>>>>> Ulrich Drepper writes:
Uli> Roland McGrath <roland@frob.com> writes:
>> Conversely, perhaps ldconfig should use ${prefix}-based file names when
>> ${prefix}!=/usr so that you would get a separate ld.so.cache universe for
>> your separate libc installation.
Uli> Volunteers?
Yes. Here's a patch. Ok to commit?
Andreas
2000-07-10 Andreas Jaeger <aj@suse.de>
* elf/Makefile (SYSCONF-FLAGS): Added to pass sysconfdir to
compiler.
(CFLAGS-ldconfig.c): Added, uses SYSCONF-FLAGS.
(CFLAGS-dl-cache.c): Likewise.
(CFLAGS-cache.c): Likewise.
* sysdeps/generic/dl-cache.h (LD_SO_CACHE): Use SYSCONFDIR to
locate cache.
* elf/ldconfig.c (LD_SO_CONF): Likewise.
============================================================
Index: elf/Makefile
--- elf/Makefile 2000/07/01 15:36:11 1.156
+++ elf/Makefile 2000/07/10 07:38:48
@@ -215,6 +215,10 @@
$(objpfx)sprof: $(libdl)
$(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
+SYSCONF-FLAGS := -DSYSCONFDIR='"$(sysconfdir)"'
+CFLAGS-ldconfig.c = $(SYSCONF-FLAGS)
+CFLAGS-dl-cache.c = $(SYSCONF-FLAGS)
+CFLAGS-cache.c = $(SYSCONF-FLAGS)
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
generated += $(addsuffix .so,$(strip $(modules-names)))
============================================================
Index: elf/ldconfig.c
--- elf/ldconfig.c 2000/05/10 09:14:27 1.4
+++ elf/ldconfig.c 2000/07/10 07:38:49
@@ -41,7 +41,7 @@
#include "dl-procinfo.h"
#ifndef LD_SO_CONF
-# define LD_SO_CONF "/etc/ld.so.conf"
+# define LD_SO_CONF SYSCONFDIR "ld.so.conf"
#endif
/* Get libc version number. */
@@ -152,7 +152,7 @@
is_hwcap (const char *name)
{
int hwcap_idx = _dl_string_hwcap (name);
-
+
if (hwcap_idx != -1 && ((1 << hwcap_idx) & HWCAP_IMPORTANT))
return 1;
return 0;
============================================================
Index: sysdeps/generic/dl-cache.h
--- sysdeps/generic/dl-cache.h 2000/05/17 11:04:01 1.3
+++ sysdeps/generic/dl-cache.h 2000/07/10 07:38:49
@@ -27,7 +27,7 @@
#endif
#ifndef LD_SO_CACHE
-# define LD_SO_CACHE "/etc/ld.so.cache"
+# define LD_SO_CACHE SYSCONFDIR ## "ld.so.cache"
#endif
#define CACHEMAGIC "ld.so-1.7.0"
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.inka.de
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |