Ticket #8380: 100-cross_compile.patch

File 100-cross_compile.patch, 4.4 KB (added by anonymous, 7 years ago)
  • configure

    diff -urp a/configure b/configure
    a b fi 
    1978619786rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 
    1978719787  fi 
    1978819788 
    19789   if test "$OPENSSL_ENABLED" = "1"; then 
    19790     if test -n "$LIB_OPENSSL"; then 
    19791  
    19792        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" 
    19793        export LD_LIBRARY_PATH 
    19794        { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5 
    19795 $as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;} 
    19796     fi 
    19797   fi 
    19798  
     19789#  if test "$OPENSSL_ENABLED" = "1"; then 
     19790#    if test -n "$LIB_OPENSSL"; then 
     19791# 
     19792#       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" 
     19793#       export LD_LIBRARY_PATH 
     19794#       { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5 
     19795#$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;} 
     19796#    fi 
     19797#  fi 
     19798# 
    1979919799fi 
    1980019800 
    1980119801 
    else 
    2025320253fi 
    2025420254 
    2025520255 
    20256       if test "x$USE_GNUTLS" = "xyes"; then 
    20257         { $as_echo "$as_me:${as_lineno-$LINENO}: detected GnuTLS version $version" >&5 
    20258 $as_echo "$as_me: detected GnuTLS version $version" >&6;} 
    20259  
    20260         if test -n "$gtlslib"; then 
    20261  
    20262           LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" 
    20263           export LD_LIBRARY_PATH 
    20264           { $as_echo "$as_me:${as_lineno-$LINENO}: Added $gtlslib to LD_LIBRARY_PATH" >&5 
    20265 $as_echo "$as_me: Added $gtlslib to LD_LIBRARY_PATH" >&6;} 
    20266         fi 
    20267       fi 
    20268  
     20256#      if test "x$USE_GNUTLS" = "xyes"; then 
     20257#        { $as_echo "$as_me:${as_lineno-$LINENO}: detected GnuTLS version $version" >&5 
     20258#$as_echo "$as_me: detected GnuTLS version $version" >&6;} 
     20259# 
     20260#        if test -n "$gtlslib"; then 
     20261# 
     20262#          LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" 
     20263#          export LD_LIBRARY_PATH 
     20264#          { $as_echo "$as_me:${as_lineno-$LINENO}: Added $gtlslib to LD_LIBRARY_PATH" >&5 
     20265#$as_echo "$as_me: Added $gtlslib to LD_LIBRARY_PATH" >&6;} 
     20266#        fi 
     20267#      fi 
     20268# 
    2026920269    fi 
    2027020270 
    2027120271  fi 
  • configure.ac

    diff -urp a/configure.ac b/configure.ac
    a b if test X"$OPT_SSL" != Xno; then 
    14951495    ]) 
    14961496  fi 
    14971497 
    1498   if test "$OPENSSL_ENABLED" = "1"; then 
    1499     if test -n "$LIB_OPENSSL"; then 
    1500        dnl when the ssl shared libs were found in a path that the run-time 
    1501        dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH 
    1502        dnl to prevent further configure tests to fail due to this 
    1503  
    1504        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" 
    1505        export LD_LIBRARY_PATH 
    1506        AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH]) 
    1507     fi 
    1508   fi 
     1498#  if test "$OPENSSL_ENABLED" = "1"; then 
     1499#    if test -n "$LIB_OPENSSL"; then 
     1500#       dnl when the ssl shared libs were found in a path that the run-time 
     1501#       dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH 
     1502#       dnl to prevent further configure tests to fail due to this### 
     1503 
     1504#       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" 
     1505#       export LD_LIBRARY_PATH 
     1506#       AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH]) 
     1507#    fi 
     1508#  fi 
    15091509 
    15101510fi 
    15111511 
    if test "$OPENSSL_ENABLED" != "1"; then 
    17151715         CPPFLAGS="$CLEANCPPFLAGS" 
    17161716       ]) 
    17171717 
    1718       if test "x$USE_GNUTLS" = "xyes"; then 
    1719         AC_MSG_NOTICE([detected GnuTLS version $version]) 
    1720  
    1721         if test -n "$gtlslib"; then 
    1722           dnl when shared libs were found in a path that the run-time 
    1723           dnl linker doesn't search through, we need to add it to 
    1724           dnl LD_LIBRARY_PATH to prevent further configure tests to fail 
    1725           dnl due to this 
    1726  
    1727           LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" 
    1728           export LD_LIBRARY_PATH 
    1729           AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH]) 
    1730         fi 
    1731       fi 
    1732  
     1718#      if test "x$USE_GNUTLS" = "xyes"; then 
     1719#        AC_MSG_NOTICE([detected GnuTLS version $version]) 
     1720# 
     1721#        if test -n "$gtlslib"; then 
     1722#          dnl when shared libs were found in a path that the run-time 
     1723#          dnl linker doesn't search through, we need to add it to 
     1724#          dnl LD_LIBRARY_PATH to prevent further configure tests to fail 
     1725#          dnl due to this 
     1726# 
     1727#          LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" 
     1728#          export LD_LIBRARY_PATH 
     1729#          AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH]) 
     1730#        fi 
     1731#      fi 
     1732# 
    17331733    fi 
    17341734 
    17351735  fi dnl GNUTLS not disabled