[src/trunk]: src/libexec/ld.elf_so - Allow RTLD_DEFAULT_LIBRARY_PATH to be ov...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cc963d86fd80
branches:  trunk
changeset: 519825:cc963d86fd80
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Dec 28 05:44:22 2001 +0000

description:
- Allow RTLD_DEFAULT_LIBRARY_PATH to be overridden.
- If ${SHLIBDIR} != ${LIBDIR}, then set RTLD_DEFAULT_LIBRARY_PATH to
  ${SHLIBDIR}:${LIBDIR}

diffstat:

 libexec/ld.elf_so/Makefile |  6 +++++-
 libexec/ld.elf_so/rtld.h   |  4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r 2f7abeacce70 -r cc963d86fd80 libexec/ld.elf_so/Makefile
--- a/libexec/ld.elf_so/Makefile        Fri Dec 28 05:30:24 2001 +0000
+++ b/libexec/ld.elf_so/Makefile        Fri Dec 28 05:44:22 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.42 2001/12/28 05:30:24 lukem Exp $
+#      $NetBSD: Makefile,v 1.43 2001/12/28 05:44:22 lukem Exp $
 
 .include <bsd.own.mk>                  # for OBJECT_FMT definition
 
@@ -38,6 +38,10 @@
 #CPPFLAGS+= -DRTLD_DEBUG_RELOC
 #DBG=  -g
 
+.if ${SHLIBDIR} != ${LIBDIR}
+CPPFLAGS+= -DRTLD_DEFAULT_LIBRARY_PATH=\"${SHLIBDIR}:${LIBDIR}\"
+.endif
+
 LDADD+=        -non_shared -L${DESTDIR}${LIBDIR} -lc_pic
 DPADD+=        ${LIBC_PIC}
 
diff -r 2f7abeacce70 -r cc963d86fd80 libexec/ld.elf_so/rtld.h
--- a/libexec/ld.elf_so/rtld.h  Fri Dec 28 05:30:24 2001 +0000
+++ b/libexec/ld.elf_so/rtld.h  Fri Dec 28 05:44:22 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtld.h,v 1.32 2001/12/14 00:53:07 thorpej Exp $         */
+/*     $NetBSD: rtld.h,v 1.33 2001/12/28 05:44:22 lukem Exp $   */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -45,7 +45,9 @@
 
 #if defined(_RTLD_SOURCE)
 
+#ifndef        RTLD_DEFAULT_LIBRARY_PATH
 #define        RTLD_DEFAULT_LIBRARY_PATH       "/usr/lib"
+#endif
 #define _PATH_LD_HINTS                 "/etc/ld.so.conf"
 
 #if 0