From 696aa7d4fe6f2f2967c784802ac1fc75bb83cb88 Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Fri, 21 Jun 2024 00:09:53 +0200 Subject: [PATCH] add fastrtps patch for gettid --- .scripts/build_linux.sh | 6 +++++- patch/ros-jazzy-fastrtps.patch | 30 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 patch/ros-jazzy-fastrtps.patch diff --git a/.scripts/build_linux.sh b/.scripts/build_linux.sh index dc712679..5dc27d3d 100755 --- a/.scripts/build_linux.sh +++ b/.scripts/build_linux.sh @@ -17,13 +17,17 @@ export CONDA_BLD_PATH="/opt/conda/build_artifacts" pwd +cd ${FEEDSTOCK_ROOT} + for recipe in ${CURRENT_RECIPES[@]}; do pixi run rattler-build build \ --recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \ - -m ${FEEDSTOCK_ROOT}/.ci_support/conda_forge_pinnings.yaml \ -m ${FEEDSTOCK_ROOT}/conda_build_config.yaml \ -c robostack-jazzy -c conda-forge \ --output-dir $CONDA_BLD_PATH + + # -m ${FEEDSTOCK_ROOT}/.ci_support/conda_forge_pinnings.yaml \ + done anaconda -t ${ANACONDA_API_TOKEN} upload /opt/conda/build_artifacts/linux-*/*.conda --force \ No newline at end of file diff --git a/patch/ros-jazzy-fastrtps.patch b/patch/ros-jazzy-fastrtps.patch new file mode 100644 index 00000000..329888be --- /dev/null +++ b/patch/ros-jazzy-fastrtps.patch @@ -0,0 +1,30 @@ +From 72ccfb186d93c3f7ba59c30fa2b05bddd31a3432 Mon Sep 17 00:00:00 2001 +From: Wade Hunkapiller +Date: Fri, 15 Mar 2024 11:11:09 -0500 +Subject: [PATCH] Add gettid() macro to address GLIBC version comptability + (#4225) + +Signed-off-by: Wade Hunkapiller +--- + src/cpp/utils/threading/threading_pthread.ipp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/cpp/utils/threading/threading_pthread.ipp b/src/cpp/utils/threading/threading_pthread.ipp +index 75ad33f2d64..252f60c775a 100644 +--- a/src/cpp/utils/threading/threading_pthread.ipp ++++ b/src/cpp/utils/threading/threading_pthread.ipp +@@ -25,6 +25,14 @@ + #include + #include + ++#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ <= 30))) ++ #include ++ #ifndef SYS_gettid ++ #error "SYS_gettid unavailable on this system" ++ #endif ++ #define gettid() ((pid_t)syscall(SYS_gettid)) ++#endif ++ + namespace eprosima { + + template \ No newline at end of file