This is an automated email from the ASF dual-hosted git repository.
astitcher 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 3167d53 PROTON-2127: Fix FreeBSD build breakage
3167d53 is described below
commit 3167d532812ecedf91b84342c59f6ac4c0fe8bb6
Author: Andrew Stitcher <astitc...@apache.org>
AuthorDate: Thu Oct 31 15:00:42 2019 -0400
PROTON-2127: Fix FreeBSD build breakage
---
cpp/src/ssl_options.cpp | 4 ++--
python/CMakeLists.txt | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cpp/src/ssl_options.cpp b/cpp/src/ssl_options.cpp
index ae5999e..83a50bc 100644
--- a/cpp/src/ssl_options.cpp
+++ b/cpp/src/ssl_options.cpp
@@ -150,8 +150,8 @@ ssl_certificate::ssl_certificate(const std::string &main,
const std::string &ext
// For backwards ABI compatibility we need to define some symbols:
//
-// Don't do this on MacOS or with Visual Studio
-#if !defined(_MSC_VER) && !(defined(__APPLE__) && defined(__MACH__))
+// Don't do this on MacOS, FreeBSD or with Visual Studio
+#if !defined(_MSC_VER) && !(defined(__APPLE__) && defined(__MACH__)) &&
!defined(__FreeBSD__)
//
// These are a bit easier as the entire class has been removed so we can just
define the class here
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index e076e0e..cb36b1c 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -212,7 +212,8 @@ if (SETUPTOOLS_MODULE_FOUND)
add_custom_target(py_pkg_src ALL
WORKING_DIRECTORY dist
DEPENDS py_src_dist
- COMMAND ${PYTHON_EXECUTABLE} setup.py sdist --dist-dir
${CMAKE_CURRENT_BINARY_DIR}/pkgs)
+ COMMAND ${PN_ENV_SCRIPT} "SWIG=${SWIG_EXECUTABLE}" --
+ ${PYTHON_EXECUTABLE} setup.py sdist --dist-dir
${CMAKE_CURRENT_BINARY_DIR}/pkgs)
if (WHEEL_MODULE_FOUND)
add_custom_target(py_pkg_wheel ALL
WORKING_DIRECTORY dist
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
