Skip to content

extend ${BUILD_PREFIX}/meson_cross_file.txt with pkgconfig & cmake setup #100

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

Merged
isuruf merged 2 commits into from
Mar 26, 2023
Merged

extend ${BUILD_PREFIX}/meson_cross_file.txt with pkgconfig & cmake setup #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1ce562
extend ${BUILD_PREFIX}/meson_cross_file.txt with pkgconfig & cmake setup
h-vetinari Mar 21, 2023
2080d1e
remove properties.pkg_config_libdir & improve comment
h-vetinari Mar 24, 2023
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
5 changes: 5 additions & 0 deletions recipe/activate-clang.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@ if [ "@CONDA_BUILD_CROSS_COMPILATION@" = "1" ]; then
echo "cpu = '@UNAME_MACHINE@'" >> ${CONDA_PREFIX}/meson_cross_file.txt
echo "cpu_family = '@MESON_CPU_FAMILY@'" >> ${CONDA_PREFIX}/meson_cross_file.txt
echo "endian = 'little'" >> ${CONDA_PREFIX}/meson_cross_file.txt
# specify path to correct binaries from build (not host) environment,
# which meson will not auto-discover (out of caution) if not told explicitly.
echo "[binaries]" >> ${CONDA_PREFIX}/meson_cross_file.txt
echo "cmake = '${CONDA_PREFIX}/bin/cmake'" >> ${CONDA_PREFIX}/meson_cross_file.txt
echo "pkgconfig = '${CONDA_PREFIX}/bin/pkg-config'" >> ${CONDA_PREFIX}/meson_cross_file.txt
fi

_tc_activation \
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% endif %}
{% set major_ver = version.split(".")[0] %}

{% set build_number = 0 %}
{% set build_number = 1 %}
# keep build number increments for old compiler versions as necessary
{% if major_ver | int <= 14 %}
{% set build_number = build_number + 5 %}
Expand Down