Skip to content

Commit

Permalink
Revert "rpkg: try meson from pipx"
Browse files Browse the repository at this point in the history
This reverts commit 3d3567a.

meson in fedora is now new enough.

Conflicts:
	fdpp.spec.rpkg
  • Loading branch information
stsp committed Mar 26, 2024
1 parent 50027fe commit 5e68fbe
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions fdpp.spec.rpkg
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ URL: https://github.com/dosemu2/fdpp
VCS: {{{ git_dir_vcs }}}
Source0: {{{ dir_pack }}}

BuildRequires: pipx
BuildRequires: meson >= 1.3.0
BuildRequires: ninja-build
BuildRequires: sed
BuildRequires: bash
Expand All @@ -39,15 +39,12 @@ It is based on a FreeDOS kernel ported to modern C++.
%global toolchain clang

%build
pipx install meson
export PATH=$PATH:/builddir/.local/bin
./configure.meson --prefix %{_prefix} --libdir %{_libdir} build
meson compile --verbose -C build %{?_smp_mflags}

%check

%install
export PATH=$PATH:~/.local/bin
meson install -C build --destdir %{buildroot}

%files
Expand Down

0 comments on commit 5e68fbe

Please sign in to comment.