Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[iceoryx] Fix acl dependency #29405

Merged
merged 2 commits into from
Feb 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 27 additions & 21 deletions ports/iceoryx/acl.patch
Original file line number Diff line number Diff line change
@@ -1,24 +1,30 @@
diff --git a/iceoryx_hoofs/platform/CMakeLists.txt b/iceoryx_hoofs/platform/CMakeLists.txt
index 78bad09f8..293784c06 100644
--- a/iceoryx_hoofs/platform/CMakeLists.txt
+++ b/iceoryx_hoofs/platform/CMakeLists.txt
@@ -55,6 +55,19 @@ target_link_libraries(iceoryx_platform PRIVATE ${ICEORYX_SANITIZER_FLAGS})
target_compile_options(iceoryx_platform PRIVATE ${ICEORYX_WARNINGS} ${ICEORYX_SANITIZER_FLAGS})
diff --git a/iceoryx_hoofs/CMakeLists.txt b/iceoryx_hoofs/CMakeLists.txt
index a8238ff..9741fd3 100644
--- a/iceoryx_hoofs/CMakeLists.txt
+++ b/iceoryx_hoofs/CMakeLists.txt
@@ -217,7 +217,9 @@ target_link_libraries(iceoryx_hoofs
)

if(LINUX)
- target_link_libraries(iceoryx_hoofs PRIVATE acl atomic ${CODE_COVERAGE_LIBS})
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(ACL REQUIRED libacl)
+
+ target_include_directories(iceoryx_platform
+ PUBLIC
+ ${ACL_INCLUDE_DIRS}
+ )
+
+ target_link_directories(iceoryx_platform
+ PUBLIC
+ ${ACL_LIBRARY_DIRS}
+ )
+
target_link_libraries(iceoryx_platform
PUBLIC
rt
+ pkg_check_modules(ACL REQUIRED IMPORTED_TARGET libacl)
+ target_link_libraries(iceoryx_hoofs PUBLIC PkgConfig::ACL PRIVATE atomic ${CODE_COVERAGE_LIBS})
endif()

target_compile_options(iceoryx_hoofs PRIVATE ${ICEORYX_WARNINGS} ${ICEORYX_SANITIZER_FLAGS})
diff --git a/iceoryx_hoofs/cmake/Config.cmake.in b/iceoryx_hoofs/cmake/Config.cmake.in
index c03b3b5..731c636 100644
--- a/iceoryx_hoofs/cmake/Config.cmake.in
+++ b/iceoryx_hoofs/cmake/Config.cmake.in
@@ -17,6 +17,10 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
+if(LINUX)
+ find_dependency(PkgConfig)
+ pkg_check_modules(ACL REQUIRED libacl IMPORTED_TARGET)
+endif()

include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
list(APPEND CMAKE_MODULE_PATH "@CMAKE_INSTALL_PREFIX@/@DESTINATION_CONFIGDIR@")
7 changes: 5 additions & 2 deletions ports/iceoryx/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME iceoryx_binding_c CONFIG_PATH lib/cmake/ic
vcpkg_cmake_config_fixup(PACKAGE_NAME iceoryx_hoofs CONFIG_PATH lib/cmake/iceoryx_hoofs DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(PACKAGE_NAME iceoryx_posh CONFIG_PATH lib/cmake/iceoryx_posh)

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/share/doc"
)

if(TOML_CONFIG)
vcpkg_copy_tools(TOOL_NAMES iox-roudi AUTO_CLEAN)
Expand Down
3 changes: 2 additions & 1 deletion ports/iceoryx/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "iceoryx",
"version": "2.0.2",
"port-version": 1,
"description": "True zero-copy inter-process-communication",
"homepage": "https://iceoryx.io",
"license": "Apache-2.0",
Expand All @@ -25,7 +26,7 @@
],
"features": {
"many-to-many": {
"description": "Using the n:n pattern for communication"
"description": "Using the m:n pattern for communication"
},
"toml-config": {
"description": "TOML support for RouDi with dynamic configuration",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3026,7 +3026,7 @@
},
"iceoryx": {
"baseline": "2.0.2",
"port-version": 0
"port-version": 1
},
"icu": {
"baseline": "72.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/i-/iceoryx.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "01c97cf0c2e2ba63c406b8b0d2b51443dec98ee2",
"version": "2.0.2",
"port-version": 1
},
{
"git-tree": "77c813fcc56fee86559404c7c22c2396509cff1a",
"version": "2.0.2",
Expand Down