Skip to content

Reintroduce library_path.sh patches from humble to fix LD_LIBRARY_PATH pollution #233

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.

Sign up for GitHub

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

Closed
Ryan4253 wants to merge 1 commit into from
+40 −0
Closed

Reintroduce library_path.sh patches from humble to fix LD_LIBRARY_PATH pollution #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions patch/ros-jazzy-ament-cmake-core.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/cmake/package_templates/templates_2_cmake.py b/cmake/package_templates/templates_2_cmake.py
index b7c0faf..328cc38 100644
--- a/cmake/package_templates/templates_2_cmake.py
+++ b/cmake/package_templates/templates_2_cmake.py
@@ -68,12 +68,7 @@ def generate_cmake_code():
"""
variables = []

- if not IS_WINDOWS:
- variables.append((
- 'ENVIRONMENT_HOOK_LIBRARY_PATH',
- '"%s"' % get_environment_hook_template_path('library_path.sh')))
- else:
- variables.append(('ENVIRONMENT_HOOK_LIBRARY_PATH', ''))
+ variables.append(('ENVIRONMENT_HOOK_LIBRARY_PATH', ''))

ext = '.bat.in' if IS_WINDOWS else '.sh.in'
variables.append((
22 changes: 22 additions & 0 deletions patch/ros-jazzy-ament-package.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/ament_package/template/environment_hook/library_path.sh b/ament_package/template/environment_hook/library_path.sh
deleted file mode 100644
index 292e518..0000000
--- a/ament_package/template/environment_hook/library_path.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# copied from ament_package/template/environment_hook/library_path.sh
-
-# detect if running on Darwin platform
-_UNAME=`uname -s`
-_IS_DARWIN=0
-if [ "$_UNAME" = "Darwin" ]; then
- _IS_DARWIN=1
-fi
-unset _UNAME
-
-if [ $_IS_DARWIN -eq 0 ]; then
- ament_prepend_unique_value LD_LIBRARY_PATH "$AMENT_CURRENT_PREFIX/lib"
-else
- ament_prepend_unique_value DYLD_LIBRARY_PATH "$AMENT_CURRENT_PREFIX/lib"
-fi
-unset _IS_DARWIN
Loading