You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jd...@apache.org on 2022/02/04 11:49:21 UTC
[qpid-proton] branch main updated: PROTON-2492 Fix -lssl Python module linking when openssl is not on default LIBRARY_PATH (#356)
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/main by this push:
new afd07cd PROTON-2492 Fix -lssl Python module linking when openssl is not on default LIBRARY_PATH (#356)
afd07cd is described below
commit afd07cdcf2b65fb47ef91cf70162029ebcfa5d9d
Author: Jiri Daněk <jd...@redhat.com>
AuthorDate: Fri Feb 4 12:49:13 2022 +0100
PROTON-2492 Fix -lssl Python module linking when openssl is not on default LIBRARY_PATH (#356)
---
python/setup.py.in | 3 +++
1 file changed, 3 insertions(+)
diff --git a/python/setup.py.in b/python/setup.py.in
index 697fa70..3412d4a 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -125,6 +125,7 @@ class Configure(build_ext):
# Look for any optional libraries that proton needs, and adjust the
# source list and compile flags as necessary.
+ library_dirs = []
libraries = []
includes = []
macros = []
@@ -145,6 +146,7 @@ class Configure(build_ext):
# pkg-config for a minimum version 0. If it's installed, it should
# return True and we'll use it. Otherwise, we'll use the stub.
if misc.pkg_config_version_installed('openssl', atleast='0'):
+ library_dirs += [misc.pkg_config_get_var('openssl', 'libdir')]
libraries += ['ssl', 'crypto']
includes += [misc.pkg_config_get_var('openssl', 'includedir')]
sources.append(os.path.join(proton_src, 'ssl', 'openssl.c'))
@@ -214,6 +216,7 @@ class Configure(build_ext):
# lastly replace the libqpid-proton-core dependency with libraries required
# by the Proton objects:
+ _cproton.library_dirs = library_dirs
_cproton.libraries = libraries
def libqpid_proton_installed(self, version):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org