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

[Backport 3.6] Move pkgconfig.sh to the framework #9889

Merged
merged 3 commits into from
Jan 14, 2025
Merged

[Backport 3.6] Move pkgconfig.sh to the framework #9889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
167b329
Move files out of Mbed TLS
valeriosetti Jan 9, 2025
bb71bb5
components-build-system.sh: align component_test_cmake_as_package
valeriosetti Jan 9, 2025
03b42ad
framework: update reference
valeriosetti Jan 9, 2025
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 framework
Open in desktop
Submodule framework updated 1 files
+40 −0 scripts/pkgconfig.sh
7 changes: 5 additions & 2 deletions tests/scripts/components-build-system.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ component_test_cmake_as_package () {
make
./cmake_package
if [[ "$OSTYPE" == linux* ]]; then
PKG_CONFIG_PATH="${build_variant_dir}/mbedtls/pkgconfig" ${root_dir}/tests/scripts/pkgconfig.sh
PKG_CONFIG_PATH="${build_variant_dir}/mbedtls/pkgconfig" \
${root_dir}/framework/scripts/pkgconfig.sh \
mbedtls mbedx509 mbedcrypto
# These are the EXPECTED package names. Renaming these could break
# consumers of pkg-config, consider carefully.
fi
}

Expand Down Expand Up @@ -212,4 +216,3 @@ component_build_cmake_programs_no_testing () {
support_build_cmake_programs_no_testing () {
support_test_cmake_out_of_source
}

37 changes: 0 additions & 37 deletions tests/scripts/pkgconfig.sh
View file
Open in desktop

This file was deleted.