Skip to content

Commit 502d125

Browse files
committed
making //ros2/test:generic_publisher_tests pass without patching rmw_fastrtps
1 parent 30186fa commit 502d125

File tree

5 files changed

+3
-5
lines changed

5 files changed

+3
-5
lines changed

repositories/fastcdr.BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ filegroup(
99
)
1010

1111
cache_entries = {
12-
"CMAKE_BUILD_TYPE": "Release",
1312
"CMAKE_POSITION_INDEPENDENT_CODE": "ON", # Must be set!
1413
"BUILD_SHARED_LIBS": "OFF",
1514
# FastCDR specific options.

repositories/fastrtps.BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ filegroup(
6969
)
7070

7171
cache_entries = {
72-
"CMAKE_BUILD_TYPE": "Release",
7372
"CMAKE_POSITION_INDEPENDENT_CODE": "ON", # Must be set!
7473
"BUILD_SHARED_LIBS": "OFF",
7574
# FastDDS specific options.

repositories/foonathan_memory.BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ filegroup(
99
)
1010

1111
cache_entries = {
12-
"CMAKE_BUILD_TYPE": "Release",
1312
"CMAKE_POSITION_INDEPENDENT_CODE": "ON", # Must be set!
1413
"BUILD_SHARED_LIBS": "OFF",
1514
# foonathan_memory specific options.

repositories/ros2_repositories_impl.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ def ros2_repositories_impl():
286286
http_archive,
287287
name = "ros2_rmw_fastrtps",
288288
build_file = "@com_github_mvukov_rules_ros2//repositories:rmw_fastrtps.BUILD.bazel",
289-
patch_args = ["-p1"],
290-
patches = ["@com_github_mvukov_rules_ros2//repositories/patches:rmw_fastrtps-fix-typesupport-conditions-bug.patch"],
289+
#patch_args = ["-p1"],
290+
#patches = ["@com_github_mvukov_rules_ros2//repositories/patches:rmw_fastrtps-fix-typesupport-conditions-bug.patch"],
291291
sha256 = "a0145b414207a2528fd56e98a56bd6d4c3f0353dcd58f4b3a65224af8bd52284",
292292
strip_prefix = "rmw_fastrtps-6.2.3",
293293
url = "https://github.com/ros2/rmw_fastrtps/archive/refs/tags/6.2.3.tar.gz",

ros2/test/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ ros2_cpp_test(
6060
idl_deps = [
6161
"@ros2_common_interfaces//:std_msgs",
6262
],
63+
linkstatic = False,
6364
deps = [
6465
"@com_google_googletest//:gtest",
6566
"@ros2_rclcpp//:rclcpp",

0 commit comments

Comments
 (0)