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.
This commit is contained in:
parent
9d0f240b84
commit
be980fd137
|
@ -221,7 +221,7 @@ happened, on your systems and applications.
|
|||
%prep
|
||||
%setup -q -n %{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}
|
||||
%endif
|
||||
# Only bundle libJudy if this isn't Fedora or SUSE
|
||||
|
@ -239,7 +239,7 @@ autoreconf -ivf
|
|||
%if 0%{!?fedora:1} && 0%{!?suse_version:1}
|
||||
--with-libJudy=externaldeps/libJudy \
|
||||
%endif
|
||||
%if 0%{?centos_ver} >= 8 || 0%{?fedora}
|
||||
%if 0%{?centos_ver} < 8 || 0%{!?fedora:1}
|
||||
--with-bundled-lws=externaldeps/libwebsockets \
|
||||
%endif
|
||||
--prefix="%{_prefix}" \
|
||||
|
|
Loading…
Reference in New Issue