1*4882a593SmuzhiyunFrom 60d100713b5289948e9cdf5b0646ff3cdd2c206b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be> 3*4882a593SmuzhiyunDate: Mon, 17 Dec 2012 22:32:44 +0100 4*4882a593SmuzhiyunSubject: [PATCH] Fix setting of LD_LIBRARY_FLAGS ($shlibpath_var). 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunLD_LIBRARY_PATH should not be set when cross-compiling, because it 7*4882a593Smuzhiyunadds the cross-libraries to the build's LD-path. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunAlso the restoring of LD_LIBRARY_PATH was done incorrectly: it would 10*4882a593Smuzhiyunset LD_LIBRARY_PATH=LD_LIBRARY_PATH. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSigned-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun macros/db3-check.m4 | 6 +++--- 15*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 3 deletions(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/macros/db3-check.m4 b/macros/db3-check.m4 18*4882a593Smuzhiyunindex 902220b..d5a5446 100644 19*4882a593Smuzhiyun--- a/macros/db3-check.m4 20*4882a593Smuzhiyun+++ b/macros/db3-check.m4 21*4882a593Smuzhiyun@@ -94,7 +94,7 @@ if test "x$bdb_required" = "xyes"; then 22*4882a593Smuzhiyun savedldflags="$LDFLAGS" 23*4882a593Smuzhiyun savedcppflags="$CPPFLAGS" 24*4882a593Smuzhiyun savedlibs="$LIBS" 25*4882a593Smuzhiyun- saved_shlibpath_var=$shlibpath_var 26*4882a593Smuzhiyun+ eval saved_shlibpath_var=\$$shlibpath_var 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun dnl required BDB version: 4.6, because of cursor API change 29*4882a593Smuzhiyun DB_MAJOR_REQ=4 30*4882a593Smuzhiyun@@ -148,7 +148,7 @@ if test "x$bdb_required" = "xyes"; then 31*4882a593Smuzhiyun dnl -- LD_LIBRARY_PATH on many platforms. This will be fairly 32*4882a593Smuzhiyun dnl -- portable hopefully. Reference: 33*4882a593Smuzhiyun dnl -- http://lists.gnu.org/archive/html/autoconf/2009-03/msg00040.html 34*4882a593Smuzhiyun- eval export $shlibpath_var=$bdblibdir 35*4882a593Smuzhiyun+ test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir 36*4882a593Smuzhiyun NETATALK_BDB_TRY_LINK 37*4882a593Smuzhiyun eval export $shlibpath_var=$saved_shlibpath_var 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun@@ -171,7 +171,7 @@ if test "x$bdb_required" = "xyes"; then 40*4882a593Smuzhiyun CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS" 41*4882a593Smuzhiyun LDFLAGS="-L$bdblibdir $LDFLAGS" 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun- eval export $shlibpath_var=$bdblibdir 44*4882a593Smuzhiyun+ test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir 45*4882a593Smuzhiyun NETATALK_BDB_TRY_LINK 46*4882a593Smuzhiyun eval export $shlibpath_var=$saved_shlibpath_var 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun-- 49