Skip to content

Commit

Permalink
Use OpenSSL 1.0.2 for Connext on MacOS (#436)
Browse files Browse the repository at this point in the history
* Set default values for RTI_OPENSSL_* to use in test_security.

Connext 5.3.1 requires an older version of openssl which is no longer
available from the system macOS installation.
Connext supplies a compatible openssl distribution and
ros2/system_tests#409 sets up a convention for
using it only for the security tests which require it when running with
Connext.

Signed-off-by: Steven! Ragnarök <[email protected]>

* update path to rti openssl

Signed-off-by: Mikael Arguedas <[email protected]>

Co-authored-by: Steven! Ragnarök <[email protected]>
  • Loading branch information
mikaelarguedas and nuclearsandwich authored Jun 17, 2020
1 parent e347765 commit 8c758cf
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions ros2_batch_job/osx_batch/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,14 @@ def pre(self):
warn('OSPL_HOME not set; using default value')
os.environ['OSPL_HOME'] = os.path.join(
os.environ['HOME'], 'opensplice', 'HDE', 'x86_64.darwin10_clang')
# TODO(nuclearsandwich) Connext 5.3.1 supports only OpenSSL 1.0.2
# remove this when upgrading to Connext 6 that supports OpenSSL 1.1.1
if 'RTI_OPENSSL_BIN' not in os.environ:
warn('RTI_OPENSSL_BIN unset; using default value')
os.environ['RTI_OPENSSL_BIN'] = '/Users/osrf/openssl-1.0.2n/x64Darwin17clang9.0/release/bin'
if 'RTI_OPENSSL_LIBS' not in os.environ:
warn('RTI_OPENSSL_LIBS unset; using default value')
os.environ['RTI_OPENSSL_LIBS'] = '/Users/osrf/openssl-1.0.2n/x64Darwin17clang9.0/release/lib'
# TODO(wjwwood): remove this when qt5 is linked on macOS by default
# See: https://github.com/Homebrew/homebrew-core/issues/8392#issuecomment-334328367
os.environ['CMAKE_PREFIX_PATH'] = os.environ.get('CMAKE_PREFIX_PATH', '') + os.pathsep + \
Expand Down

0 comments on commit 8c758cf

Please sign in to comment.