From 9b7cdb760360347de2f3079d219a30e20848ed30 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Fri, 27 Mar 2020 14:39:33 +1100 Subject: 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 --- bare/config/devel/gettext-0.18.3.1-1.cfg | 2 +- bare/config/devel/glib-2.39.3-1.cfg | 2 +- bare/config/devel/glib-2.46.2-1.cfg | 2 +- bare/config/devel/glib-2.48.2-1.cfg | 2 +- bare/config/devel/libffi-3.0.13-1.cfg | 2 +- bare/config/devel/libiconv-1.14-1.cfg | 2 +- bare/config/devel/pcre-8.40-1.cfg | 2 +- bare/config/devel/pixman-0.32.4-1.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'bare') diff --git a/bare/config/devel/gettext-0.18.3.1-1.cfg b/bare/config/devel/gettext-0.18.3.1-1.cfg index 141a897..7fe8450 100644 --- a/bare/config/devel/gettext-0.18.3.1-1.cfg +++ b/bare/config/devel/gettext-0.18.3.1-1.cfg @@ -14,6 +14,6 @@ # # 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 %endif diff --git a/bare/config/devel/glib-2.39.3-1.cfg b/bare/config/devel/glib-2.39.3-1.cfg index d86fe28..9ff7af5 100644 --- a/bare/config/devel/glib-2.39.3-1.cfg +++ b/bare/config/devel/glib-2.39.3-1.cfg @@ -17,6 +17,6 @@ # # 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 %endif diff --git a/bare/config/devel/glib-2.46.2-1.cfg b/bare/config/devel/glib-2.46.2-1.cfg index c65022f..1dc8f78 100644 --- a/bare/config/devel/glib-2.46.2-1.cfg +++ b/bare/config/devel/glib-2.46.2-1.cfg @@ -21,6 +21,6 @@ # # 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 %endif diff --git a/bare/config/devel/glib-2.48.2-1.cfg b/bare/config/devel/glib-2.48.2-1.cfg index 6454346..9e85fce 100644 --- a/bare/config/devel/glib-2.48.2-1.cfg +++ b/bare/config/devel/glib-2.48.2-1.cfg @@ -17,6 +17,6 @@ # # 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 %endif diff --git a/bare/config/devel/libffi-3.0.13-1.cfg b/bare/config/devel/libffi-3.0.13-1.cfg index 99098b2..bc52679 100644 --- a/bare/config/devel/libffi-3.0.13-1.cfg +++ b/bare/config/devel/libffi-3.0.13-1.cfg @@ -26,6 +26,6 @@ # # 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 %endif diff --git a/bare/config/devel/libiconv-1.14-1.cfg b/bare/config/devel/libiconv-1.14-1.cfg index df2a8e5..acf0b72 100644 --- a/bare/config/devel/libiconv-1.14-1.cfg +++ b/bare/config/devel/libiconv-1.14-1.cfg @@ -16,7 +16,7 @@ # The Libiconv build instructions. We use 0.x.x Release 1. # %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 %endif %endif diff --git a/bare/config/devel/pcre-8.40-1.cfg b/bare/config/devel/pcre-8.40-1.cfg index 8627260..f6031fd 100644 --- a/bare/config/devel/pcre-8.40-1.cfg +++ b/bare/config/devel/pcre-8.40-1.cfg @@ -14,6 +14,6 @@ # # 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 %endif diff --git a/bare/config/devel/pixman-0.32.4-1.cfg b/bare/config/devel/pixman-0.32.4-1.cfg index 2478348..a5aef16 100644 --- a/bare/config/devel/pixman-0.32.4-1.cfg +++ b/bare/config/devel/pixman-0.32.4-1.cfg @@ -14,6 +14,6 @@ # # 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 %endif -- cgit v1.2.3