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 3a77bb0 Remove default option passed for rpath to linker on HP-UX
3a77bb0 is described below
commit 3a77bb0bcf2901779c204973d57ecfd5de4d2a41
Author: Michael Osipov <[email protected]>
AuthorDate: Mon May 18 16:05:59 2020 +0200
Remove default option passed for rpath to linker on HP-UX
The option '+b:' is passed by default for rpath if no explicit value passed
to '+b'.
---
native/build/tcnative.m4 | 2 +-
xdocs/miscellaneous/changelog.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/native/build/tcnative.m4 b/native/build/tcnative.m4
index b99fe93..9681586 100644
--- a/native/build/tcnative.m4
+++ b/native/build/tcnative.m4
@@ -218,7 +218,7 @@ case "$use_openssl" in
*-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"
+ TCN_OPENSSL_LIBS="-L$use_openssl/$ssllibdir -lssl -lcrypto"
;;
*linux*|*freebsd*)
TCN_OPENSSL_LIBS="-L$use_openssl/$ssllibdir
-Wl,-rpath,$use_openssl/$ssllibdir -lssl -lcrypto"
diff --git a/xdocs/miscellaneous/changelog.xml
b/xdocs/miscellaneous/changelog.xml
index 1caa86a..2b5c073 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -53,6 +53,9 @@
Add support for HP-UX's _lwp_self() in our
ssl_thread_id(void). (michaelo)
</add>
+ <remove>
+ Remove default option passed for rpath to linker on HP-UX. (michaelo)
+ </remove>
</changelog>
</section>
<section name="Changes in 1.2.24">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
