summaryrefslogtreecommitdiff
path: root/extra/Configs/Config.in
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-10-03 07:53:52 +0000
committerEric Andersen <andersen@codepoet.org>2004-10-03 07:53:52 +0000
commit3b8039fd51c6b2e292d44794ba273aca2c88b321 (patch)
treeee2868495a5f93fa093887d6e39e8da4768c330c /extra/Configs/Config.in
parent31cfe2300d8b9aee110ba0a7213f6befdd3ffce0 (diff)
This patch from Mike Frysinger, extended from an earlier patch from Peter S.
Mazinger implements the changes suggested by me on the uclibc list. On Tuesday 28 September 2004 02:24 pm, Erik Andersen wrote: > What I think should be done is > > *) Someone that cares about USE_CACHE should fix that option > up to be sure it works, and give it a proper config entry > in extra/Configs/Config.in, and rename it to something > more appropriate such as LDSO_CACHE_SUPPORT. > > *) When LDSO_CACHE_SUPPORT=n, UCLIBC_RUNTIME_PREFIX /usr/X11R6/lib > should be included in the default library search path in > dl-elf.c, ldd, and ldconfig. > > *) When LDSO_CACHE_SUPPORT=y, UCLIBC_RUNTIME_PREFIX /usr/X11R6/lib > should be excluded from the default library search path in > dl-elf.c, ldd, and ldconfig, and those wishing to include > X11 stuff should add that into /etc/ld.so.conf and re-run > ldconfig. > > *) At present, LDSO_CONF and LDSO_CACHE use the same names > and same structure as glibc. This precludes > LDSO_CACHE_SUPPORT being uses in any sane fashion on a > dial glibc and uClibc system. Just as it was necessary > for use to use a different name for 'libuClibc' rather > than 'libc', and 'ld-uClibc.so.0' rather than > 'ld-linux.so.2' it seems that these configuration files > really ought to be given different names. >
Diffstat (limited to 'extra/Configs/Config.in')
-rw-r--r--extra/Configs/Config.in25
1 files changed, 25 insertions, 0 deletions
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index d0933722e..51caa36ce 100644
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -200,6 +200,7 @@ config FORCE_SHAREABLE_TEXT_SEGMENTS
config UCLIBC_PIE_SUPPORT
bool "Support ET_DYN in shared library loader"
+ depends on BUILD_UCLIBC_LDSO
select FORCE_SHAREABLE_TEXT_SEGMENTS
default n
help
@@ -223,6 +224,30 @@ config LDSO_LDD_SUPPORT
application to function. Disabling this option will makes uClibc's
shared library loader a little bit smaller. Most people will answer Y.
+config LDSO_CACHE_SUPPORT
+ bool "Enable shared library loader cache"
+ depends on BUILD_UCLIBC_LDSO
+ default y
+ help
+ Enable this to make use of /etc/ld.so.conf, the shared library loader
+ cache configuration file to support for non-standard library paths.
+ After updating this file, it is necessary to run 'ldconfig' to update
+ the /etc/ld.so.cache shared library loader cache file.
+
+config LDSO_BASE_FILENAME
+ string "Shared library loader cache naming prefix"
+ depends on LDSO_CACHE_SUPPORT
+ default "ld.so"
+ help
+ If you wish to support both uClibc and glibc on the same system, it
+ is necessary to set this to something other than "ld.so" to avoid
+ conflicts with glibc, which also uses "ld.so". This prevents both
+ libraries from using the same /etc/ld.so.cache file. If you wish to
+ support both uClibc and glibc on the same system then you should set
+ this to "ld-uClibc.so".
+
+ Most people will leave this set to the default of "ld.so".
+
config UCLIBC_CTOR_DTOR
bool "Support global constructors and destructors"
default y