* shlib.conf: Fix RUN_ENV for Irix. [pulled up from 1.2.2]

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13238 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index fbef1e8485e1848d5ec81e76c912737a2430ee79..4cff564e1bf341e326be8c4a2f64cc7dad7766f7 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-10  Tom Yu  <tlyu@mit.edu>
+
+       * shlib.conf: Fix RUN_ENV for Irix. [pulled up from 1.2.2]
+
 2001-01-28  Tom Yu  <tlyu@mit.edu>
 
        * shlib.conf: We don't need aix.bincmds anymore for AIX.  Use the

diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index 49a617e113912054b4b6d30fb11006a400baaf77..bae060e4880a2893a90b7cf6daacea1b046ac6eb 100644 (file)
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -78,7 +78,15 @@ mips-sgi-irix6.3)    # This is a Kludge; see below
        PROFFLAGS=-p
        CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
        CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
-       RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
+       # This grossness is necessary due to the presence of *three*
+       # supported ABIs on Irix, and the precedence of the rpath over
+       # LD_LIBRARY*_PATH.  Like OSF/1, _RLD*_ROOT needs to be set to
+       # work around this lossage.
+       add='`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`'
+       dummy=/dev/dummmy/d
+       # Set the N32 and 64 variables first because the unqualified
+       # variables affect all three and can cause the sed command to fail.
+       RUN_ENV="LD_LIBRARYN32_PATH=$add:/usr/lib32:/usr/lib32/internal:/lib32:/opt/lib32; export LD_LIBRARYN32_PATH; _RLDN32_ROOT=$dummy; export _RLDN32_ROOT; LD_LIBRARY64_PATH=$add:/usr/lib64:/usr/lib64/internal:/lib64:/opt/lib64; export LD_LIBRARY64_PATH; _RLD64_ROOT=$dummy; export _RLD64_ROOT; LD_LIBRARY_PATH=$add:/usr/lib:/usr/lib/internal:/lib:/lib/cmplrs/cc:/usr/lib/cmplrs/cc:/opt/lib; export LD_LIBRARY_PATH; _RLD_ROOT=$dummy; export _RLD_ROOT;"
        ;;
 
 mips-sgi-irix*)
@@ -92,7 +100,15 @@ mips-sgi-irix*)
        PROFFLAGS=-p
        CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
        CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
-       RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
+       # This grossness is necessary due to the presence of *three*
+       # supported ABIs on Irix, and the precedence of the rpath over
+       # LD_LIBRARY*_PATH.  Like OSF/1, _RLD*_ROOT needs to be set to
+       # work around this lossage.
+       add='`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`'
+       dummy=/dev/dummmy/d
+       # Set the N32 and 64 variables first because the unqualified
+       # variables affect all three and can cause the sed command to fail.
+       RUN_ENV="LD_LIBRARYN32_PATH=$add:/usr/lib32:/usr/lib32/internal:/lib32:/opt/lib32; export LD_LIBRARYN32_PATH; _RLDN32_ROOT=$dummy; export _RLDN32_ROOT; LD_LIBRARY64_PATH=$add:/usr/lib64:/usr/lib64/internal:/lib64:/opt/lib64; export LD_LIBRARY64_PATH; _RLD64_ROOT=$dummy; export _RLD64_ROOT; LD_LIBRARY_PATH=$add:/usr/lib:/usr/lib/internal:/lib:/lib/cmplrs/cc:/usr/lib/cmplrs/cc:/opt/lib; export LD_LIBRARY_PATH; _RLD_ROOT=$dummy; export _RLD_ROOT;"
        ;;
 
 # untested...