diff options
Diffstat (limited to 'bare')
| -rw-r--r-- | bare/config/devel/gettext-0.18.3.1-1.cfg | 2 | ||||
| -rw-r--r-- | bare/config/devel/glib-2.39.3-1.cfg | 2 | ||||
| -rw-r--r-- | bare/config/devel/libffi-3.0.13-1.cfg | 2 | ||||
| -rw-r--r-- | bare/config/devel/libiconv-1.14-1.cfg | 2 | ||||
| -rw-r--r-- | bare/config/devel/pixman-0.32.4-1.cfg | 2 | ||||
| -rw-r--r-- | bare/config/devel/texane-stlink-1.cfg | 2 |
6 files changed, 6 insertions, 6 deletions
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 debdb0a..42a6e74 100644 --- a/bare/config/devel/gettext-0.18.3.1-1.cfg +++ b/bare/config/devel/gettext-0.18.3.1-1.cfg @@ -13,6 +13,6 @@ # # The GetText build instructions. We use 0.x.x Release 1. # -%ifn %{check gettext} +%ifn %{pkgconfig check gettext} %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 8812343..405e511 100644 --- a/bare/config/devel/glib-2.39.3-1.cfg +++ b/bare/config/devel/glib-2.39.3-1.cfg @@ -15,6 +15,6 @@ # # The GLib build instructions. We use 2.x.x Release 1. # -%ifn %{check glib-2.0} +%ifn %{pkgconfig check glib-2.0} %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 f609003..acb145d 100644 --- a/bare/config/devel/libffi-3.0.13-1.cfg +++ b/bare/config/devel/libffi-3.0.13-1.cfg @@ -24,6 +24,6 @@ # # The LibFFI build instructions. We use 3.x.x Release 1. # -%ifn %{check libffi >= 3} +%ifn %{pkgconfig check libffi >= 3} %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 4943fe0..fb064c8 100644 --- a/bare/config/devel/libiconv-1.14-1.cfg +++ b/bare/config/devel/libiconv-1.14-1.cfg @@ -14,7 +14,7 @@ # The Libiconv build instructions. We use 0.x.x Release 1. # %if %{_host_os} == win32 - %ifn %{check iconv >= %{libiconv_version}} + %ifn %{pkgconfig check iconv >= %{libiconv_version}} %include %{_configdir}/libiconv-1-1.cfg %endif %endif diff --git a/bare/config/devel/pixman-0.32.4-1.cfg b/bare/config/devel/pixman-0.32.4-1.cfg index ec7d4c9..de0d8e4 100644 --- a/bare/config/devel/pixman-0.32.4-1.cfg +++ b/bare/config/devel/pixman-0.32.4-1.cfg @@ -13,6 +13,6 @@ # # The Pixman build instructions. We use 0.x.x Release 1. # -%ifn %{check pixman-1} +%ifn %{pkgconfig check pixman-1} %include %{_configdir}/pixman-0-1.cfg %endif diff --git a/bare/config/devel/texane-stlink-1.cfg b/bare/config/devel/texane-stlink-1.cfg index e071789..2f102cc 100644 --- a/bare/config/devel/texane-stlink-1.cfg +++ b/bare/config/devel/texane-stlink-1.cfg @@ -45,7 +45,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) CFLAGS_FOR_BUILD="-g -O2 -Wall" \ %endif CPPFLAGS="-I $SB_TMPPREFIX/include/libusb-1.0" \ - CFLAGS="$SB_OPT_FLAGS" \ + CFLAGS="$SB_CFLAGS" \ LDFLAGS="-L $SB_TMPPREFIX/lib" \ ./configure \ --build=%{_build} --host=%{_host} \ |