Ticket #10812: 100-cross-compile.patch

File 100-cross-compile.patch, 3.9 KB (added by Marcos Tadeu <marcos@…>, 6 years ago)
  • configure.ac

    a b if test X"$OPT_SSL" != Xno; then 
    15221522  fi 
    15231523 
    15241524  if test "$OPENSSL_ENABLED" = "1"; then 
    1525     if test -n "$LIB_OPENSSL"; then 
    1526        dnl when the ssl shared libs were found in a path that the run-time 
    1527        dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH 
    1528        dnl to prevent further configure tests to fail due to this 
    1529  
    1530        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" 
    1531        export LD_LIBRARY_PATH 
    1532        AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH]) 
    1533     fi 
    15341525    CURL_CHECK_OPENSSL_API 
    15351526  fi 
    15361527 
    if test "$OPENSSL_ENABLED" != "1"; then 
    17591750 
    17601751      if test "x$USE_GNUTLS" = "xyes"; then 
    17611752        AC_MSG_NOTICE([detected GnuTLS version $version]) 
    1762  
    1763         if test -n "$gtlslib"; then 
    1764           dnl when shared libs were found in a path that the run-time 
    1765           dnl linker doesn't search through, we need to add it to 
    1766           dnl LD_LIBRARY_PATH to prevent further configure tests to fail 
    1767           dnl due to this 
    1768  
    1769           LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" 
    1770           export LD_LIBRARY_PATH 
    1771           AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH]) 
    1772         fi 
    17731753      fi 
    17741754 
    17751755    fi 
    if test "$OPENSSL_ENABLED" != "1"; then 
    18691849 
    18701850      CURL_LIBS="$CURL_LIBS -lpolarssl" 
    18711851      LIBS="$LIBS -lpolarssl" 
    1872  
    1873       if test -n "$polarssllib"; then 
    1874         dnl when shared libs were found in a path that the run-time 
    1875         dnl linker doesn't search through, we need to add it to 
    1876         dnl LD_LIBRARY_PATH to prevent further configure tests to fail 
    1877         dnl due to this 
    1878  
    1879         LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$polarssllib" 
    1880         export LD_LIBRARY_PATH 
    1881         AC_MSG_NOTICE([Added $polarssllib to LD_LIBRARY_PATH]) 
    1882       fi 
    1883  
    18841852    fi 
    18851853 
    18861854  fi dnl PolarSSL not disabled 
    if test "$OPENSSL_ENABLED" != "1"; then 
    19581926 
    19591927      CURL_LIBS="$CURL_LIBS -lcyassl -lm" 
    19601928      LIBS="$LIBS -lcyassl -lm" 
    1961  
    1962       if test -n "$cyassllib"; then 
    1963         dnl when shared libs were found in a path that the run-time 
    1964         dnl linker doesn't search through, we need to add it to 
    1965         dnl LD_LIBRARY_PATH to prevent further configure tests to fail 
    1966         dnl due to this 
    1967  
    1968         LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$cyassllib" 
    1969         export LD_LIBRARY_PATH 
    1970         AC_MSG_NOTICE([Added $cyassllib to LD_LIBRARY_PATH]) 
    1971       fi 
    1972  
    19731929    fi 
    19741930 
    19751931  fi dnl CyaSSL not disabled 
    if test "$OPENSSL_ENABLED" != "1" -a "$G 
    20532009         CPPFLAGS="$CLEANCPPFLAGS" 
    20542010       ]) 
    20552011 
    2056       if test "x$USE_NSS" = "xyes"; then 
    2057         AC_MSG_NOTICE([detected NSS version $version]) 
    2058  
    2059         dnl when shared libs were found in a path that the run-time 
    2060         dnl linker doesn't search through, we need to add it to 
    2061         dnl LD_LIBRARY_PATH to prevent further configure tests to fail 
    2062         dnl due to this 
    2063  
    2064         LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff" 
    2065         export LD_LIBRARY_PATH 
    2066         AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH]) 
    2067       fi 
    2068  
    20692012    fi 
    20702013 
    20712014  fi dnl NSS not disabled 
    if test "$curl_ssl_msg" = "$init_ssl_msg 
    21142057      AXTLS_ENABLED=1 
    21152058      USE_AXTLS="yes" 
    21162059      curl_ssl_msg="enabled (axTLS)" 
    2117  
    2118  
    2119       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_AXTLS" 
    2120       export LD_LIBRARY_PATH 
    2121       AC_MSG_NOTICE([Added $LIB_AXTLS to LD_LIBRARY_PATH]) 
    21222060      ],[ 
    21232061      LDFLAGS="$CLEANLDFLAGS" 
    21242062      CPPFLAGS="$CLEANCPPFLAGS" 
    if test X"$OPT_LIBSSH2" != Xno; then 
    22202158       dnl libssh2_session_handshake was added in 1.2.8 
    22212159       AC_CHECK_FUNCS( libssh2_version libssh2_init libssh2_exit \ 
    22222160                       libssh2_scp_send64 libssh2_session_handshake) 
    2223  
    2224        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DIR_SSH2" 
    2225        export LD_LIBRARY_PATH 
    2226        AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH]) 
    22272161    fi 
    22282162  else 
    22292163    dnl no libssh2, revert back to clean variables