summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-05-29 11:11:49 +0200
committerRemi Collet <fedora@famillecollet.com>2016-05-29 11:11:49 +0200
commit69e429d206d6cd962dfecf0f1d00e002fad251c6 (patch)
tree5893ade9ff3a9c3419177aaadad7d3310d2c8fe4
parentb7961ec62d0f275d615912901d01dab0a36153ca (diff)
PHP 5.5 + 5.6, fix build with gd 2.2
-rw-r--r--php55.spec9
1 files changed, 6 insertions, 3 deletions
diff --git a/php55.spec b/php55.spec
index d22b3a7..a148b0c 100644
--- a/php55.spec
+++ b/php55.spec
@@ -1154,9 +1154,6 @@ ln -sf ../configure
--with-freetype-dir=%{_prefix} \
--with-png-dir=%{_prefix} \
--with-xpm-dir=%{_prefix} \
-%if %{with_vpx}
- --with-vpx-dir=%{_prefix} \
-%endif
--enable-gd-native-ttf \
--with-t1lib=%{_prefix} \
--without-gdbm \
@@ -1202,6 +1199,9 @@ build --libdir=%{_libdir}/php \
--with-gd=shared,%{_prefix} \
%else
--with-gd=shared \
+%if %{with_vpx}
+ --with-vpx-dir=%{_prefix} \
+%endif
%endif
--with-gmp=shared \
--enable-calendar=shared \
@@ -1349,6 +1349,9 @@ build --includedir=%{_includedir}/php-zts \
--with-gd=shared,%{_prefix} \
%else
--with-gd=shared \
+%if %{with_vpx}
+ --with-vpx-dir=%{_prefix} \
+%endif
%endif
--with-gmp=shared \
--enable-calendar=shared \