From 2e460e8d0fe14de2f12cc12b7a6c366a0a2b9380 Mon Sep 17 00:00:00 2001 From: Christian Rauch Date: Sun, 1 Sep 2024 19:29:25 +0200 Subject: [PATCH] replace and remove _target_platform --- bloom/generators/rpm/templates/meson/template.spec.em | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bloom/generators/rpm/templates/meson/template.spec.em b/bloom/generators/rpm/templates/meson/template.spec.em index cc2626a9..07bd1e94 100644 --- a/bloom/generators/rpm/templates/meson/template.spec.em +++ b/bloom/generators/rpm/templates/meson/template.spec.em @@ -46,26 +46,26 @@ if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup. --cmake-prefix-path="@(InstallationPrefix)" \ --libdir=lib \ --libexecdir=lib \ - %{_target_platform} -%meson_build -C %{_target_platform} + %{_vpath_builddir} +%meson_build %install # In case we're installing to a non-standard location, look for a setup.sh # in the install tree and source it. It will set things like # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi -%meson_install -C %{_target_platform} +%meson_install %if 0%{?with_tests} %check # Look for a Makefile target with a name indicating that it runs tests -TEST_TARGET=$(%__ninja -C %{_target_platform} -t targets | sed "s/^\(test\|check\):.*/\\1/;t f;d;:f;q0") +TEST_TARGET=$(%__ninja -C %{_vpath_builddir} -t targets | sed "s/^\(test\|check\):.*/\\1/;t f;d;:f;q0") if [ -n "$TEST_TARGET" ]; then # In case we're installing to a non-standard location, look for a setup.sh # in the install tree and source it. It will set things like # CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH. if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi -%meson_test -C %{_target_platform} || echo "RPM TESTS FAILED" +%meson_test || echo "RPM TESTS FAILED" else echo "RPM TESTS SKIPPED"; fi %endif