rpm: use embedded yajl in RHEL builds

A standalone yajl library is unwanted in RHEL, and nothing else therein depends on it; based on c10s: https://gitlab.com/redhat/centos-stream/rpms/crun/-/merge_requests/102 Signed-off-by: Yaakov Selkowitz <[email protected]>
containers · Oct 21, 2024 · bf0a351 · bf0a351
1 parent 093ed74
commit bf0a351
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/rpm/crun.spec b/rpm/crun.spec
@@ -1,5 +1,6 @@
 %global krun_opts %{nil}
 %global wasmedge_opts %{nil}
+%global yajl_opts %{nil}
 
 %if %{defined copr_username}
 %define copr_build 1
@@ -24,6 +25,12 @@
 
 %endif
 
+%if %{defined fedora} || (%{defined rhel} && 0%{?rhel} < 10)
+%global system_yajl 1
+%else
+%global yajl_opts --enable-embedded-yajl
+%endif
+
 Summary: OCI runtime written in C
 Name: crun
 %if %{defined copr_build}
@@ -55,7 +62,9 @@ BuildRequires: libcap-devel
 BuildRequires: libkrun-devel
 %endif
 BuildRequires: systemd-devel
+%if %{defined system_yajl}
 BuildRequires: yajl-devel
+%endif
 BuildRequires: libseccomp-devel
 BuildRequires: python3-libmount
 BuildRequires: libtool
@@ -105,7 +114,7 @@ Recommends: wasmedge
 
 %build
 ./autogen.sh
-./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts}
+./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %{yajl_opts}
 %make_build
 
 %install