[git commit nptl] fixup working in helptexts

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Sun Nov 22 08:37:56 UTC 2009


commit: http://git.uclibc.org/uClibc/commit/?id=cef02267b4473c27f1dd30b7fb26e5ed832b86d8
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

and spell out suggested defaults for LDSO_RUNPATH

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 extra/Configs/Config.in |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index 1d3e153..7f14b9c 100644
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -282,7 +282,7 @@ config LDSO_LDD_SUPPORT
 	depends on HAVE_SHARED
 	default y
 	help
-	  Enable this to enable all the code needed to support traditional ldd,
+	  Enable all the code needed to support traditional ldd,
 	  which executes the shared library loader to resolve all dependencies
 	  and then provide a list of shared libraries that are required for an
 	  application to function.  Disabling this option will makes uClibc's
@@ -333,14 +333,15 @@ config UCLIBC_STATIC_LDCONFIG
 	  Enable this option to statically link the ldconfig binary.
 
 	  Making ldconfig static can be beneficial if you have a library
-	  problem and need to use ldconfig to recover.  Sometimes, it is
+	  problem and need to use ldconfig to recover.  Sometimes it is
 	  preferable to instead keep the size of the system down, in which
 	  case you should disable this option.
 
 config LDSO_RUNPATH
 	bool "Enable ELF RUNPATH tag support"
 	depends on HAVE_SHARED
-	default y
+	default y if LDSO_CACHE_SUPPORT
+	default n if !LDSO_CACHE_SUPPORT
 	help
 	  ELF's may have dynamic RPATH/RUNPATH tags.  These tags list paths
 	  which extend the library search paths.  They are really only useful
-- 
1.6.3.3



More information about the uClibc-cvs mailing list