Skip to content

Commit 696aa7d

Browse files
committed
add fastrtps patch for gettid
1 parent 4ea2538 commit 696aa7d

File tree

2 files changed

+35
-1
lines changed

2 files changed

+35
-1
lines changed

.scripts/build_linux.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,17 @@ export CONDA_BLD_PATH="/opt/conda/build_artifacts"
1717

1818
pwd
1919

20+
cd ${FEEDSTOCK_ROOT}
21+
2022
for recipe in ${CURRENT_RECIPES[@]}; do
2123
pixi run rattler-build build \
2224
--recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \
23-
-m ${FEEDSTOCK_ROOT}/.ci_support/conda_forge_pinnings.yaml \
2425
-m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \
2526
-c robostack-jazzy -c conda-forge \
2627
--output-dir $CONDA_BLD_PATH
28+
29+
# -m ${FEEDSTOCK_ROOT}/.ci_support/conda_forge_pinnings.yaml \
30+
2731
done
2832

2933
anaconda -t ${ANACONDA_API_TOKEN} upload /opt/conda/build_artifacts/linux-*/*.conda --force

patch/ros-jazzy-fastrtps.patch

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 72ccfb186d93c3f7ba59c30fa2b05bddd31a3432 Mon Sep 17 00:00:00 2001
2+
From: Wade Hunkapiller <[email protected]>
3+
Date: Fri, 15 Mar 2024 11:11:09 -0500
4+
Subject: [PATCH] Add gettid() macro to address GLIBC version comptability
5+
(#4225)
6+
7+
Signed-off-by: Wade Hunkapiller <[email protected]>
8+
---
9+
src/cpp/utils/threading/threading_pthread.ipp | 8 ++++++++
10+
1 file changed, 8 insertions(+)
11+
12+
diff --git a/src/cpp/utils/threading/threading_pthread.ipp b/src/cpp/utils/threading/threading_pthread.ipp
13+
index 75ad33f2d64..252f60c775a 100644
14+
--- a/src/cpp/utils/threading/threading_pthread.ipp
15+
+++ b/src/cpp/utils/threading/threading_pthread.ipp
16+
@@ -25,6 +25,14 @@
17+
#include <fastdds/dds/log/Log.hpp>
18+
#include <fastdds/rtps/attributes/ThreadSettings.hpp>
19+
20+
+#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ <= 30)))
21+
+ #include <sys/syscall.h>
22+
+ #ifndef SYS_gettid
23+
+ #error "SYS_gettid unavailable on this system"
24+
+ #endif
25+
+ #define gettid() ((pid_t)syscall(SYS_gettid))
26+
+#endif
27+
+
28+
namespace eprosima {
29+
30+
template<typename... Args>

0 commit comments

Comments
 (0)