diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-09-04 18:04:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 18:04:59 -0400 |
| commit | 4f108b1ff259c66dacfce11306ca885b99a57b56 (patch) | |
| tree | 56a045c0e27996835c9bfe8c0fae17b2d615dbe8 /netdata.spec.in | |
| parent | 5fe817361b5022a7e1923e4ae40645796da1055b (diff) | |
Fixed handling of libJudy bundling for RPM packages. (#9875)
Diffstat (limited to 'netdata.spec.in')
| -rw-r--r-- | netdata.spec.in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/netdata.spec.in b/netdata.spec.in index 76b204078e..76034c603e 100644 --- a/netdata.spec.in +++ b/netdata.spec.in @@ -132,9 +132,14 @@ BuildRequires: judy-devel BuildRequires: liblz4-devel BuildRequires: libjson-c-devel %else +%if 0%{?fedora} BuildRequires: Judy-devel BuildRequires: lz4-devel BuildRequires: json-c-devel +%else +BuildRequires: lz4-devel +BuildRequires: json-c-devel +%endif %endif # Core build requirements for service install @@ -245,6 +250,10 @@ happened, on your systems and applications. %setup -q -n %{name}-%{version} export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-mosquitto.sh ${RPM_BUILD_DIR}/%{name}-%{version} export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-lws.sh ${RPM_BUILD_DIR}/%{name}-%{version} +# Only bundle libJudy if this isn't Fedora or SUSE +%if 0%{!?fedora:1} && 0%{!?suse_version:1} +export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-judy.sh ${RPM_BUILD_DIR}/%{name}-%{version} +%endif %if 0%{?have_bpf} export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-libbpf.sh ${RPM_BUILD_DIR}/%{name}-%{version} %endif @@ -253,6 +262,9 @@ export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging # Conf step autoreconf -ivf %configure \ + %if 0%{!?fedora:1} && 0%{!?suse_version:1} + --with-libjudy=externaldeps/libJudy + %endif --prefix="%{_prefix}" \ --sysconfdir="%{_sysconfdir}" \ --localstatedir="%{_localstatedir}" \ |