Author: markt
Date: Mon Jan 30 11:38:11 2017
New Revision: 1780899
URL: http://svn.apache.org/viewvc?rev=1780899&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59996
Correctly handle building tc-native on a 64-bit system when using an OpenSSL
distribution that is not in /usr. (csutherl)
Modified:
tomcat/native/trunk/native/build/tcnative.m4
tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/trunk/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/tcnative.m4?rev=1780899&r1=1780898&r2=1780899&view=diff
==============================================================================
--- tomcat/native/trunk/native/build/tcnative.m4 (original)
+++ tomcat/native/trunk/native/build/tcnative.m4 Mon Jan 30 11:38:11 2017
@@ -210,22 +210,23 @@ case "$use_openssl" in
TCN_OPENSSL_LIBS="-lssl -lcrypto"
else
TCN_OPENSSL_INC="-I$use_openssl/include"
+ test -d $use_openssl/lib64 && libdir=lib64 || libdir=lib
case $host in
*-solaris*)
- TCN_OPENSSL_LIBS="-L$use_openssl/lib -R$use_openssl/lib -lssl
-lcrypto"
+ TCN_OPENSSL_LIBS="-L$use_openssl/$libdir
-R$use_openssl/$libdir -lssl -lcrypto"
;;
*-hp-hpux*)
- TCN_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lssl -lcrypto"
+ TCN_OPENSSL_LIBS="-L$use_openssl/$libdir -Wl,+b: -lssl
-lcrypto"
;;
*linux*)
- TCN_OPENSSL_LIBS="-L$use_openssl/lib
-Wl,-rpath,$use_openssl/lib -lssl -lcrypto"
+ TCN_OPENSSL_LIBS="-L$use_openssl/$libdir
-Wl,-rpath,$use_openssl/$libdir -lssl -lcrypto"
;;
*)
- TCN_OPENSSL_LIBS="-L$use_openssl/lib -lssl -lcrypto"
+ TCN_OPENSSL_LIBS="-L$use_openssl/$libdir -lssl -lcrypto"
;;
esac
fi
- AC_MSG_RESULT(using openssl from $use_openssl/lib and
$use_openssl/include)
+ AC_MSG_RESULT(using openssl from $use_openssl/$libdir and
$use_openssl/include)
saved_cflags="$CFLAGS"
saved_libs="$LIBS"
Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1780899&r1=1780898&r2=1780899&view=diff
==============================================================================
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Mon Jan 30 11:38:11
2017
@@ -37,6 +37,11 @@
<section name="Changes in 1.2.11">
<changelog>
<fix>
+ <bug>59996</bug>: Correctly handle building tc-native on a 64-bit system
+ when using an OpenSSL distribution that is not in <code>/usr</code>.
+ (csutherl)
+ </fix>
+ <fix>
<bug>60388</bug>: The --disable-maintainer-mode option of the configure
script no longer enables the maintainer mode. (ebourg)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
