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.

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

Jump to bottom

[dunfell][gatesgarth][hardknott][honister][kirkstone] Add 'nativesdk' to some python package recipes to fix colcon nativesdk recipe #988

Open
wants to merge 4 commits into
base: dunfell
Choose a base branch
from
Open

[dunfell][gatesgarth][hardknott][honister][kirkstone] Add 'nativesdk' to some python package recipes to fix colcon nativesdk recipe #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
319e2aa
Make some python packages extend 'nativesdk' to fix adding colcon to SDK
RiZom-91 Dec 29, 2021
abadd24
Add 'nativesdk' to asio, libtinyxml2 and python3-lark-parser
RiZom-91 Dec 30, 2021
f0b47b0
Patched fastrtps to find thirdparty library TinyXML2
RiZom-91 Dec 30, 2021
8c81b50
Patched rcl-yaml-param-parser to find thirdparty library yaml
RiZom-91 Dec 30, 2021
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
2 changes: 1 addition & 1 deletion meta-ros-common/recipes-devtools/python/python-lark-parser.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ SRC_URI[sha256sum] = "f2d5ee2f90aa28d3f4034c30af7a0561a7e9860e911dba4f35faa440a3

inherit pypi

BBCLASSEXTEND = "native"
BBCLASSEXTEND = "native nativesdk"
1 change: 1 addition & 0 deletions meta-ros-common/recipes-devtools/python/python3-coloredlogs_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BBCLASSEXTEND += "nativesdk"
1 change: 1 addition & 0 deletions meta-ros-common/recipes-devtools/python/python3-dateutil_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BBCLASSEXTEND += "nativesdk"
1 change: 1 addition & 0 deletions meta-ros-common/recipes-devtools/python/python3-docutils_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BBCLASSEXTEND += "nativesdk"
1 change: 1 addition & 0 deletions meta-ros-common/recipes-devtools/python/python3-humanfriendly_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BBCLASSEXTEND += "nativesdk"
2 changes: 1 addition & 1 deletion meta-ros-common/recipes-support/asio/asio_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright (c) 2019-2020 LG Electronics, Inc.

BBCLASSEXTEND = "native"
BBCLASSEXTEND = "native nativesdk"

FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
SRC_URI += "file://0001-examples-cpp03-fix-build-without-std-chrono.patch"
1 change: 1 addition & 0 deletions meta-ros-common/recipes-support/libtinyxml2/libtinyxml2_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BBCLASSEXTEND += "nativesdk"
16 changes: 16 additions & 0 deletions ...es-bbappends/fastrtps/fastrtps/0001-FindTinyXML2.cmake-fix-find_library-libtinyxml2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/cmake/modules/FindTinyXML2.cmake b/cmake/modules/FindTinyXML2.cmake
index 44b8e645..ba964578 100644
--- a/cmake/modules/FindTinyXML2.cmake
+++ b/cmake/modules/FindTinyXML2.cmake
@@ -39,7 +39,10 @@ else()
if(TINYXML2_FROM_SOURCE)
find_path(TINYXML2_SOURCE_DIR NAMES tinyxml2.cpp NO_CMAKE_FIND_ROOT_PATH)
else()
- find_library(TINYXML2_LIBRARY tinyxml2)
+ find_library(TINYXML2_LIBRARIES tinyxml2)
+ add_library(tinyxml2 SHARED IMPORTED)
+ set_property(TARGET tinyxml2 APPEND PROPERTY IMPORTED_LOCATION "${TINYXML2_LIBRARIES}")
+ set(TINYXML2_LIBRARY tinyxml2)
endif()

include(FindPackageHandleStandardArgs)
3 changes: 3 additions & 0 deletions meta-ros2-galactic/recipes-bbappends/fastrtps/fastrtps_%.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ FILES:${PN} += "${prefix}/tools"
sysroot_stage_all:append() {
sysroot_stage_dir ${D}${bindir} ${SYSROOT_DESTDIR}${bindir}
}

FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += "file://0001-FindTinyXML2.cmake-fix-find_library-libtinyxml2.patch"
14 changes: 14 additions & 0 deletions ...es-bbappends/rcl/rcl-yaml-param-parser/0001-CMakeLists.txt-fix-find_library-libyaml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 397f662a..1a0ce113 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,9 @@ find_package(ament_cmake_ros REQUIRED)
find_package(rcutils REQUIRED)
find_package(rmw REQUIRED)
find_package(libyaml_vendor REQUIRED)
+find_library(LIBYAML_LIBRARIES NAMES yaml libyaml)
+add_library(yaml SHARED IMPORTED)
+set_property(TARGET yaml APPEND PROPERTY IMPORTED_LOCATION "${LIBYAML_LIBRARIES}")

# Default to C++14
if(NOT CMAKE_CXX_STANDARD)
64 changes: 0 additions & 64 deletions ...bbappends/rcl/rcl-yaml-param-parser/0001-CMakeLists.txt-use-pkg-config-to-find-yaml.patch
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions meta-ros2-galactic/recipes-bbappends/rcl/rcl-yaml-param-parser_3.1.2-1.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@ inherit pkgconfig

DEPENDS += "libyaml"

FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
SRC_URI += "file://0001-CMakeLists.txt-use-pkg-config-to-find-yaml.patch"
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += " \
file://0001-CMakeLists.txt-fix-find_library-libyaml.patch \
"