This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/master by this push: new ebd4e93 Bug 64315: configure output for OpenSSL wrong/incomplete sometimes ebd4e93 is described below commit ebd4e932b05b46b99795d8db8bfdcfc788e031c6 Author: Michael Osipov <micha...@apache.org> AuthorDate: Mon Apr 6 22:32:51 2020 +0200 Bug 64315: configure output for OpenSSL wrong/incomplete sometimes Set $ssllibdir in all cases not just the non-default ones. --- native/build/tcnative.m4 | 4 +++- xdocs/miscellaneous/changelog.xml | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/native/build/tcnative.m4 b/native/build/tcnative.m4 index 23e3010..3047371 100644 --- a/native/build/tcnative.m4 +++ b/native/build/tcnative.m4 @@ -204,18 +204,20 @@ case "$use_openssl" in fi USE_OPENSSL='-DOPENSSL' + test -d $use_openssl/lib64 && ssllibdir=lib64 || ssllibdir=lib if test "$use_openssl" = "/usr" then TCN_OPENSSL_INC="" TCN_OPENSSL_LIBS="-lssl -lcrypto" else TCN_OPENSSL_INC="-I$use_openssl/include" - test -d $use_openssl/lib64 && ssllibdir=lib64 || ssllibdir=lib case $host in *-solaris*) TCN_OPENSSL_LIBS="-L$use_openssl/$ssllibdir -R$use_openssl/$ssllibdir -lssl -lcrypto" ;; *-hp-hpux*) + # By default cc/aCC on HP-UX IA64 will produce 32 bit output + ssllibdir=lib/hpux32 TCN_OPENSSL_LIBS="-L$use_openssl/$ssllibdir -Wl,+b: -lssl -lcrypto" ;; *linux*) diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 7ce5696..9a89667 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -46,6 +46,10 @@ <update> <bug>64260</bug>: Clean up install target. (michaelo) </update> + <fix> + <bug>64315</bug>: configure output for OpenSSL wrong/incomplete sometimes. + (michaelo) + </fix> <update> Drop obsolete build time workarounds for HP-UX. (michaelo) </update> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org