Skip to content
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

Jump to bottom

[openSUSE] rpm: add support for canokeys (boo#1217520) #47

Merged
merged 1 commit into from
Jan 9, 2024
Merged

[openSUSE] rpm: add support for canokeys (boo#1217520) #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions rpm/common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@

%bcond_with chkqtests

%ifarch x86_64
%bcond_without canokey
%else
%bcond_with canokey
%endif

# non-x86 archs still seem to have some issues with Link Time Optimization
%ifnarch %ix86 x86_64
%define _lto_cflags %{nil}
Expand Down
6 changes: 6 additions & 0 deletions rpm/qemu.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ BuildRequires: pkgconfig(libndctl)
%if 0%{?with_rbd}
BuildRequires: librbd-devel
%endif
%if 0%{with canokey}
BuildRequires: canokey-qemu-devel
%endif
%if 0%{?with_uring}
BuildRequires: pkgconfig(liburing) >= %liburing_min_version
%endif
Expand Down Expand Up @@ -660,6 +663,9 @@ EXTRA_CFLAGS="$(echo %{optflags} | sed -E 's/-[A-Z]?_FORTIFY_SOURCE[=]?[0-9]*//g
%endif
%if 0%{?with_rbd}
--enable-rbd \
%endif
%if 0%{with canokey}
--enable-canokey \
%endif
--enable-alsa \
--enable-attr \
Expand Down