Skip to content

Commit e79e62a

Browse files
committed
rpm: switch to make
Cross-build with meson is currently broken. The problem is that meson doesn't pass --target to clang, and clang doesn't seem to find the right bfd linker even if passed with that option.
1 parent 7d7203c commit e79e62a

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

fdpp.spec.rpkg

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ URL: https://github.com/dosemu2/fdpp
1414
VCS: {{{ git_dir_vcs }}}
1515
Source0: {{{ dir_pack }}}
1616

17-
BuildRequires: meson >= 1.3.2
1817
BuildRequires: sed
1918
BuildRequires: bash
2019
BuildRequires: clang
@@ -38,13 +37,13 @@ It is based on a FreeDOS kernel ported to modern C++.
3837
%global toolchain clang
3938

4039
%build
41-
./configure.meson --prefix %{_prefix} --libdir %{_libdir} build
42-
meson compile --verbose -C build %{?_smp_mflags}
40+
./configure
41+
make %{?_smp_mflags} prefix=%{_prefix} libdir=%{_libdir}
4342

4443
%check
4544

4645
%install
47-
meson install -C build --destdir %{buildroot}
46+
make prefix=%{_prefix} libdir=%{_libdir} DESTDIR=%{buildroot} install
4847

4948
%files
5049
%defattr(-,root,root)

0 commit comments

Comments
 (0)