Skip to content

Commit

Permalink
replace and remove _target_platform
Browse files Browse the repository at this point in the history
  • Loading branch information
christianrauch committed Sep 1, 2024
1 parent fa9842a commit 2e460e8
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions bloom/generators/rpm/templates/meson/template.spec.em
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 2e460e8

Please sign in to comment.