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 committed
Feb 22, 2021 at 07:09 UTC
be980fd137723de86c996178fd63e6babf735121
1 file changed
+2
-2
netdata.spec.in
+2
-2
@@ -221,7 +221,7 @@ happened, on your systems and applications.
221
%prep
222
%setup -q -n %{name}-%{version}
223
export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-mosquitto.sh ${RPM_BUILD_DIR}/%{name}-%{version}
224
-%if 0%{?centos_ver} >= 8 || 0%{?fedora}
224
+%if 0%{?centos_ver} < 8 || 0%{!?fedora:1}
225
export CFLAGS="${CFLAGS} -fPIC" && ${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-lws.sh ${RPM_BUILD_DIR}/%{name}-%{version}
226
%endif
227
# Only bundle libJudy if this isn't Fedora or SUSE
@@ -239,7 +239,7 @@ autoreconf -ivf
239
%if 0%{!?fedora:1} && 0%{!?suse_version:1}
240
--with-libJudy=externaldeps/libJudy \
241
%endif
242
- %if 0%{?centos_ver} >= 8 || 0%{?fedora}
242
+ %if 0%{?centos_ver} < 8 || 0%{!?fedora:1}
243
--with-bundled-lws=externaldeps/libwebsockets \
244
%endif
245
--prefix="%{_prefix}" \