Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
8c338f4d
Unverified
Commit
8c338f4d
authored
Nov 10, 2019
by
Dominik Charousset
Committed by
GitHub
Nov 10, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #955
OpenBSD support
parents
cd92c25e
59f61c9b
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
18 additions
and
9 deletions
+18
-9
CMakeLists.txt
CMakeLists.txt
+6
-1
libcaf_core/CMakeLists.txt
libcaf_core/CMakeLists.txt
+1
-1
libcaf_core/caf/config.hpp
libcaf_core/caf/config.hpp
+2
-0
libcaf_io/CMakeLists.txt
libcaf_io/CMakeLists.txt
+1
-1
libcaf_io/src/io/network/interfaces.cpp
libcaf_io/src/io/network/interfaces.cpp
+2
-0
libcaf_io/src/io/network/native_socket.cpp
libcaf_io/src/io/network/native_socket.cpp
+4
-4
libcaf_opencl/CMakeLists.txt
libcaf_opencl/CMakeLists.txt
+1
-1
libcaf_openssl/CMakeLists.txt
libcaf_openssl/CMakeLists.txt
+1
-1
No files found.
CMakeLists.txt
View file @
8c338f4d
...
@@ -168,7 +168,12 @@ math(EXPR CAF_VERSION_PATCH "${VERSION_INT} % 100")
...
@@ -168,7 +168,12 @@ math(EXPR CAF_VERSION_PATCH "${VERSION_INT} % 100")
# create full version string
# create full version string
set
(
CAF_VERSION
set
(
CAF_VERSION
"
${
CAF_VERSION_MAJOR
}
.
${
CAF_VERSION_MINOR
}
.
${
CAF_VERSION_PATCH
}
"
)
"
${
CAF_VERSION_MAJOR
}
.
${
CAF_VERSION_MINOR
}
.
${
CAF_VERSION_PATCH
}
"
)
# set the library version for our shared library targets
if
(
CMAKE_HOST_SYSTEM_NAME MATCHES
"OpenBSD"
)
set
(
CAF_LIB_VERSION
"
${
CAF_VERSION_MAJOR
}
.
${
CAF_VERSION_MINOR
}
"
)
else
()
set
(
CAF_LIB_VERSION
"
${
CAF_VERSION
}
"
)
endif
()
################################################################################
################################################################################
# set output paths for binaries and libraries if not provided by the user #
# set output paths for binaries and libraries if not provided by the user #
...
...
libcaf_core/CMakeLists.txt
View file @
8c338f4d
...
@@ -181,7 +181,7 @@ if (NOT CAF_BUILD_STATIC_ONLY)
...
@@ -181,7 +181,7 @@ if (NOT CAF_BUILD_STATIC_ONLY)
set_target_properties
(
libcaf_core_shared
set_target_properties
(
libcaf_core_shared
PROPERTIES
PROPERTIES
SOVERSION
${
CAF_VERSION
}
SOVERSION
${
CAF_VERSION
}
VERSION
${
CAF_VERSION
}
VERSION
${
CAF_
LIB_
VERSION
}
OUTPUT_NAME caf_core
OUTPUT_NAME caf_core
)
)
install
(
TARGETS libcaf_core_shared
install
(
TARGETS libcaf_core_shared
...
...
libcaf_core/caf/config.hpp
View file @
8c338f4d
...
@@ -209,6 +209,8 @@
...
@@ -209,6 +209,8 @@
# endif
# endif
#elif defined(__FreeBSD__)
#elif defined(__FreeBSD__)
# define CAF_BSD
# define CAF_BSD
#elif defined(__OpenBSD__)
# define CAF_BSD
#elif defined(__CYGWIN__)
#elif defined(__CYGWIN__)
# define CAF_CYGWIN
# define CAF_CYGWIN
#elif defined(WIN32) || defined(_WIN32)
#elif defined(WIN32) || defined(_WIN32)
...
...
libcaf_io/CMakeLists.txt
View file @
8c338f4d
...
@@ -64,7 +64,7 @@ if (NOT CAF_BUILD_STATIC_ONLY)
...
@@ -64,7 +64,7 @@ if (NOT CAF_BUILD_STATIC_ONLY)
set_target_properties
(
libcaf_io_shared
set_target_properties
(
libcaf_io_shared
PROPERTIES
PROPERTIES
SOVERSION
${
CAF_VERSION
}
SOVERSION
${
CAF_VERSION
}
VERSION
${
CAF_VERSION
}
VERSION
${
CAF_
LIB_
VERSION
}
OUTPUT_NAME caf_io
)
OUTPUT_NAME caf_io
)
install
(
TARGETS libcaf_io_shared
install
(
TARGETS libcaf_io_shared
RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
...
...
libcaf_io/src/io/network/interfaces.cpp
View file @
8c338f4d
...
@@ -288,8 +288,10 @@ bool interfaces::get_endpoint(const std::string& host, uint16_t port,
...
@@ -288,8 +288,10 @@ bool interfaces::get_endpoint(const std::string& host, uint16_t port,
hint
.
ai_socktype
=
SOCK_DGRAM
;
hint
.
ai_socktype
=
SOCK_DGRAM
;
if
(
preferred
)
if
(
preferred
)
hint
.
ai_family
=
*
preferred
==
protocol
::
network
::
ipv4
?
AF_INET
:
AF_INET6
;
hint
.
ai_family
=
*
preferred
==
protocol
::
network
::
ipv4
?
AF_INET
:
AF_INET6
;
#ifdef AI_V4MAPPED
if
(
hint
.
ai_family
==
AF_INET6
)
if
(
hint
.
ai_family
==
AF_INET6
)
hint
.
ai_flags
=
AI_V4MAPPED
;
hint
.
ai_flags
=
AI_V4MAPPED
;
#endif
addrinfo
*
tmp
=
nullptr
;
addrinfo
*
tmp
=
nullptr
;
if
(
getaddrinfo
(
host
.
c_str
(),
port_hint
,
&
hint
,
&
tmp
)
!=
0
)
if
(
getaddrinfo
(
host
.
c_str
(),
port_hint
,
&
hint
,
&
tmp
)
!=
0
)
return
false
;
return
false
;
...
...
libcaf_io/src/io/network/native_socket.cpp
View file @
8c338f4d
...
@@ -93,9 +93,9 @@ const int ec_out_of_memory = ENOMEM;
...
@@ -93,9 +93,9 @@ const int ec_out_of_memory = ENOMEM;
const
int
ec_interrupted_syscall
=
EINTR
;
const
int
ec_interrupted_syscall
=
EINTR
;
#endif
#endif
//
platform-dependent SIGPIPE setup
//
Platform-dependent setup for supressing SIGPIPE.
#if defined(CAF_MACOS) || defined(CAF_IOS) || defined(
CAF_BSD
)
#if defined(CAF_MACOS) || defined(CAF_IOS) || defined(
__FreeBSD__
)
//
Use the socket option but no flags to recv/send on macOS/iOS/
BSD.
//
Set the SO_NOSIGPIPE socket option on macOS, iOS and Free
BSD.
const
int
no_sigpipe_socket_flag
=
SO_NOSIGPIPE
;
const
int
no_sigpipe_socket_flag
=
SO_NOSIGPIPE
;
const
int
no_sigpipe_io_flag
=
0
;
const
int
no_sigpipe_io_flag
=
0
;
#elif defined(CAF_WINDOWS)
#elif defined(CAF_WINDOWS)
...
@@ -103,7 +103,7 @@ const int no_sigpipe_io_flag = 0;
...
@@ -103,7 +103,7 @@ const int no_sigpipe_io_flag = 0;
const
int
no_sigpipe_socket_flag
=
0
;
const
int
no_sigpipe_socket_flag
=
0
;
const
int
no_sigpipe_io_flag
=
0
;
const
int
no_sigpipe_io_flag
=
0
;
#else
#else
//
Use flags to recv/send on Linux/Android but no socket option
.
//
Pass MSG_NOSIGNAL to recv/send on Linux/Android/OpenBSD
.
const
int
no_sigpipe_socket_flag
=
0
;
const
int
no_sigpipe_socket_flag
=
0
;
const
int
no_sigpipe_io_flag
=
MSG_NOSIGNAL
;
const
int
no_sigpipe_io_flag
=
MSG_NOSIGNAL
;
#endif
#endif
...
...
libcaf_opencl/CMakeLists.txt
View file @
8c338f4d
...
@@ -28,7 +28,7 @@ if(NOT CAF_BUILD_STATIC_ONLY)
...
@@ -28,7 +28,7 @@ if(NOT CAF_BUILD_STATIC_ONLY)
set_target_properties
(
libcaf_opencl_shared
set_target_properties
(
libcaf_opencl_shared
PROPERTIES
PROPERTIES
SOVERSION
"
${
CAF_VERSION
}
"
SOVERSION
"
${
CAF_VERSION
}
"
VERSION
"
${
CAF_VERSION
}
"
VERSION
"
${
CAF_
LIB_
VERSION
}
"
OUTPUT_NAME caf_opencl
)
OUTPUT_NAME caf_opencl
)
install
(
TARGETS libcaf_opencl_shared LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
install
(
TARGETS libcaf_opencl_shared LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
)
endif
()
endif
()
...
...
libcaf_openssl/CMakeLists.txt
View file @
8c338f4d
...
@@ -32,7 +32,7 @@ if (NOT CAF_BUILD_STATIC_ONLY)
...
@@ -32,7 +32,7 @@ if (NOT CAF_BUILD_STATIC_ONLY)
set_target_properties
(
libcaf_openssl_shared
set_target_properties
(
libcaf_openssl_shared
PROPERTIES
PROPERTIES
SOVERSION
${
CAF_VERSION
}
SOVERSION
${
CAF_VERSION
}
VERSION
${
CAF_VERSION
}
VERSION
${
CAF_
LIB_
VERSION
}
OUTPUT_NAME caf_openssl
)
OUTPUT_NAME caf_openssl
)
if
(
CYGWIN
)
if
(
CYGWIN
)
install
(
TARGETS libcaf_openssl_shared RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
)
install
(
TARGETS libcaf_openssl_shared RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment