diff options
| author | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-10-12 10:48:28 +0000 |
|---|---|---|
| committer | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2004-10-12 10:48:28 +0000 |
| commit | 23f341e5b7285a7185f6be0ca8dac62df13b89ae (patch) | |
| tree | 21e61be4d2bd67c7ecf82ad8ef54283bc50066a7 /ldso | |
| parent | 70f37cc506d13685549482b9a3ce2440718a2e54 (diff) | |
Mark Rakes writes:
without LDSO_CACHE_SUPPORT turned on, LDSO_CONF and LDSO_CACHE are
not defined anywhere, but still used by ldconfig.c This patch allows
ldconfig to build again, although there may be a cleaner way to fix
this????
Applied with minor modification.
Diffstat (limited to 'ldso')
| -rw-r--r-- | ldso/include/dl-defs.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ldso/include/dl-defs.h b/ldso/include/dl-defs.h index 1894a56dd..38f8762be 100644 --- a/ldso/include/dl-defs.h +++ b/ldso/include/dl-defs.h @@ -10,17 +10,20 @@ #define LIB_ELF_LIBC0 4 /* should we include features.h? */ -#if defined(__LDSO_PRELOAD_FILE_SUPPORT__) || defined(__LDSO_CACHE_SUPPORT__) +#ifndef __LDSO_BASE_FILENAME__ +#define __LDSO_BASE_FILENAME__ "ld.so" +#endif #define LDSO_BASE_PATH UCLIBC_RUNTIME_PREFIX "etc/" __LDSO_BASE_FILENAME__ #ifdef __LDSO_PRELOAD_FILE_SUPPORT__ #define LDSO_PRELOAD LDSO_BASE_PATH ".preload" #endif -#ifdef __LDSO_CACHE_SUPPORT__ +/* NB: ldconfig still uses these values */ #define LDSO_CONF LDSO_BASE_PATH ".conf" #define LDSO_CACHE LDSO_BASE_PATH ".cache" +#ifdef __LDSO_CACHE_SUPPORT__ #define LDSO_CACHE_MAGIC "ld.so-" #define LDSO_CACHE_MAGIC_LEN (sizeof LDSO_CACHE_MAGIC -1) #define LDSO_CACHE_VER "1.7.0" @@ -39,6 +42,4 @@ typedef struct { } libentry_t; #endif /* __LDSO_CACHE_SUPPORT__ */ -#endif - #endif /* _LD_DEFS_H */ |