Browse Source

Fixed condition controlling use of static LWS in RPM builds. (#10661)

The original intent was to only use a static copy of LWS if we couldn’t
use a system copy. Due to two incorrect conditionals in the spec file
though, what was actually happening was that we were using a static
build of LWS on systems where we could use a system copy, and not
linking against LWS at all on other systems.

This fixes those conditionals so that we use a system copy if available,
and provide a static copy if a system copy is not available.
Austin S. Hemmelgarn 4 years ago
parent
commit
be980fd137
1 changed files with 2 additions and 2 deletions
  1. 2 2
      netdata.spec.in

+ 2 - 2
netdata.spec.in

@@ -221,7 +221,7 @@ happened, on your systems and applications.
 %prep
 %prep
 %setup -q -n %{name}-%{version}
 %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-mosquitto.sh ${RPM_BUILD_DIR}/%{name}-%{version}
-%if 0%{?centos_ver} >= 8 || 0%{?fedora}
+%if 0%{?centos_ver} < 8 || 0%{!?fedora:1}
 export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-lws.sh ${RPM_BUILD_DIR}/%{name}-%{version}
 export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-lws.sh ${RPM_BUILD_DIR}/%{name}-%{version}
 %endif
 %endif
 # Only bundle libJudy if this isn't Fedora or SUSE
 # Only bundle libJudy if this isn't Fedora or SUSE
@@ -239,7 +239,7 @@ autoreconf -ivf
 	%if 0%{!?fedora:1} && 0%{!?suse_version:1}
 	%if 0%{!?fedora:1} && 0%{!?suse_version:1}
 	--with-libJudy=externaldeps/libJudy \
 	--with-libJudy=externaldeps/libJudy \
 	%endif
 	%endif
-	%if 0%{?centos_ver} >= 8 || 0%{?fedora}
+	%if 0%{?centos_ver} < 8 || 0%{!?fedora:1}
 	--with-bundled-lws=externaldeps/libwebsockets \
 	--with-bundled-lws=externaldeps/libwebsockets \
 	%endif
 	%endif
 	--prefix="%{_prefix}" \
 	--prefix="%{_prefix}" \