diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-05-29 11:11:49 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-05-29 11:11:49 +0200 |
| commit | 488f9156ee7fcbcd32493e94d8290a2f87031a46 (patch) | |
| tree | 163c6dc0473e0839080f3e461280e178ec75e15c /php.spec | |
| parent | 7225d3cca851643acc641d7dc66bd7b457f7639a (diff) | |
PHP 5.5 + 5.6, fix build with gd 2.2
Diffstat (limited to 'php.spec')
| -rw-r--r-- | php.spec | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -714,9 +714,6 @@ BuildRequires: libXpm-devel %if %{with_t1lib} BuildRequires: t1lib-devel %endif -%if %{with_vpx} -BuildRequires: libvpx-devel -%endif %if %{with_libgd} BuildRequires: gd-devel >= 2.1.1 %if 0%{?fedora} <= 19 && 0%{?rhel} <= 7 @@ -724,6 +721,10 @@ Requires: gd-last%{?_isa} >= 2.1.1 %else Requires: gd%{?_isa} >= 2.1.1 %endif +%else +%if %{with_vpx} +BuildRequires: libvpx-devel +%endif %endif %description gd @@ -1083,9 +1084,6 @@ ln -sf ../configure --with-freetype-dir=%{_root_prefix} \ --with-png-dir=%{_root_prefix} \ --with-xpm-dir=%{_root_prefix} \ -%if %{with_vpx} - --with-vpx-dir=%{_root_prefix} \ -%endif --enable-gd-native-ttf \ %if %{with_t1lib} --with-t1lib=%{_root_prefix} \ @@ -1132,6 +1130,9 @@ build --libdir=%{_libdir}/php \ --with-gd=shared,%{_root_prefix} \ %else --with-gd=shared \ +%if %{with_vpx} + --with-vpx-dir=%{_root_prefix} \ +%endif %endif --with-gmp=shared \ --enable-calendar=shared \ |