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 2019/11/26 14:53:28 UTC

[qpid-proton] branch master updated: PROTON-2147 on xcode10.1, openssl is in opt/openssl@11/, not in opt/openssl/ (#215)

This is an automated email from the ASF dual-hosted git repository.

jdanek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git


The following commit(s) were added to refs/heads/master by this push:
     new cf4fd22  PROTON-2147 on xcode10.1, openssl is in opt/openssl@11/, not in opt/openssl/ (#215)
cf4fd22 is described below

commit cf4fd22c76ce142156be7ae643ba4e3689499fb1
Author: Jiří Daněk <jd...@redhat.com>
AuthorDate: Tue Nov 26 15:53:22 2019 +0100

    PROTON-2147 on xcode10.1, openssl is in opt/openssl@11/, not in opt/openssl/ (#215)
---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c6828a7..300f57e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,7 @@ matrix:
   - os: osx
     osx_image: xcode10.1
     env:
-    - PKG_CONFIG_PATH='/usr/local/opt/openssl/lib/pkgconfig'
+    - PKG_CONFIG_PATH='/usr/local/opt/openssl@1.1/lib/pkgconfig'
     - PATH="/usr/local/opt/python/libexec/bin:/usr/local/bin:$PATH"
     - QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DBUILD_RUBY=NO -DBUILD_PYTHON=OFF -DBUILD_GO=ON'
     before_install:
@@ -54,7 +54,7 @@ matrix:
     - brew install libuv swig jsoncpp
 
 # Note addons is apt specific at the moment and will not be applied for osx.
-# See before_install brew commands below
+# See before_install brew commands above
 addons:
   apt:
     packages:
@@ -84,4 +84,3 @@ before_script:
 
 script:
 - cmake --build . --target install -- -j$(nproc) && ctest -V ${QPID_PROTON_CTEST_ARGS}
-


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org