bare: Fix pkgconfig checks and getting source.

- If the package was installed the check does not build the package.
  This also meant getting the source failed.

Closes #3919
This commit is contained in:
Chris Johns 2020-03-27 14:39:33 +11:00
parent 25386b12ed
commit 9b7cdb7603
8 changed files with 8 additions and 8 deletions

View File

@ -14,6 +14,6 @@
# #
# The GetText build instructions. We use 0.x.x Release 1. # The GetText build instructions. We use 0.x.x Release 1.
# #
%ifn %{pkgconfig check gettext} %if !%{pkgconfig check gettext} || %{defined _rsb_getting_source}
%include %{_configdir}/gettext-0-1.cfg %include %{_configdir}/gettext-0-1.cfg
%endif %endif

View File

@ -17,6 +17,6 @@
# #
# The GLib build instructions. We use 2.x.x Release 1. # The GLib build instructions. We use 2.x.x Release 1.
# #
%ifn %{pkgconfig check glib-2.0} %if !%{pkgconfig check glib-2.0} || %{defined _rsb_getting_source}
%include %{_configdir}/glib-2-1.cfg %include %{_configdir}/glib-2-1.cfg
%endif %endif

View File

@ -21,6 +21,6 @@
# #
# The GLib build instructions. We use 2.x.x Release 1. # The GLib build instructions. We use 2.x.x Release 1.
# #
%ifn %{pkgconfig check glib-2.0} %if !%{pkgconfig check glib-2.0} || %{defined _rsb_getting_source}
%include %{_configdir}/glib-2-1.cfg %include %{_configdir}/glib-2-1.cfg
%endif %endif

View File

@ -17,6 +17,6 @@
# #
# The GLib build instructions. We use 2.x.x Release 1. # The GLib build instructions. We use 2.x.x Release 1.
# #
%ifn %{pkgconfig check glib-2.0} %if !%{pkgconfig check glib-2.0} || %{defined _rsb_getting_source}
%include %{_configdir}/glib-2-1.cfg %include %{_configdir}/glib-2-1.cfg
%endif %endif

View File

@ -26,6 +26,6 @@
# #
# The LibFFI build instructions. We use 3.x.x Release 1. # The LibFFI build instructions. We use 3.x.x Release 1.
# #
%ifn %{pkgconfig check libffi >= 3} %if !%{pkgconfig check libffi >= 3} || %{defined _rsb_getting_source}
%include %{_configdir}/libffi-3-1.cfg %include %{_configdir}/libffi-3-1.cfg
%endif %endif

View File

@ -16,7 +16,7 @@
# The Libiconv build instructions. We use 0.x.x Release 1. # The Libiconv build instructions. We use 0.x.x Release 1.
# #
%if %{_host_os} == win32 %if %{_host_os} == win32
%ifn %{pkgconfig check iconv >= %{libiconv_version}} %if !%{pkgconfig check iconv >= %{libiconv_version}} || %{defined _rsb_getting_source}
%include %{_configdir}/libiconv-1-1.cfg %include %{_configdir}/libiconv-1-1.cfg
%endif %endif
%endif %endif

View File

@ -14,6 +14,6 @@
# #
# The PCRE build instructions. We use 8.x Release 1. # The PCRE build instructions. We use 8.x Release 1.
# #
%ifn %{pkgconfig check pcre} %if !%{pkgconfig check pcre} || %{defined _rsb_getting_source}
%include %{_configdir}/pcre-8-1.cfg %include %{_configdir}/pcre-8-1.cfg
%endif %endif

View File

@ -14,6 +14,6 @@
# #
# The Pixman build instructions. We use 0.x.x Release 1. # The Pixman build instructions. We use 0.x.x Release 1.
# #
%ifn %{pkgconfig check pixman-1} %if !%{pkgconfig check pixman-1} || %{defined _rsb_getting_source}
%include %{_configdir}/pixman-0-1.cfg %include %{_configdir}/pixman-0-1.cfg
%endif %endif