Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2018-02-05 10:45:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7"
Mon Feb 5 10:45:07 2018 rev:31 rq:571942 version:7.2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/php7/php7.changes 2018-01-16
09:32:48.572536665 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new/php7.changes 2018-02-05
10:45:10.334323582 +0100
@@ -1,0 +2,10 @@
+Fri Jan 26 08:38:46 UTC 2018 - pgaj...@suse.com
+
+- do not build against system gd when suse_version < 1500
+
+-------------------------------------------------------------------
+Tue Jan 23 09:24:31 UTC 2018 - pgaj...@suse.com
+
+- fix build for SLE12*
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php7.spec ++++++
--- /var/tmp/diff_new_pack.GU50Pf/_old 2018-02-05 10:45:13.102193989 +0100
+++ /var/tmp/diff_new_pack.GU50Pf/_new 2018-02-05 10:45:13.106193802 +0100
@@ -42,6 +42,10 @@
%if %{?suse_version} > 1320
%define build_sodium 1
%endif
+%define system_gd 0
+%if %{?suse_version} >= 1500
+%define system_gd 1
+%endif
Name: php7
Version: 7.2.1
Release: 0
@@ -96,7 +100,9 @@
BuildRequires: freetds-devel
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
+%if %{system_gd}
BuildRequires: gd-devel
+%endif
BuildRequires: gmp-devel
BuildRequires: imap-devel
BuildRequires: krb5-devel
@@ -1171,7 +1177,7 @@
--with-zlib=shared \
--with-bz2=shared \
--with-curl=shared \
-%if 0%{?suse_version} >= 1320 || %{?is_opensuse}
+%if %{system_gd}
--with-gd=shared,%{_usr} \
%else
--with-gd=shared \
@@ -1235,6 +1241,14 @@
exit 1
fi
+# check if we link against system libgd
+%if %{system_gd}
+if [ -z "$(ldd modules/gd.so | grep libgd.so)" ]; then
+ echo 'php-gd does not link against system libgd.'
+ exit 1
+fi
+%endif
+
# Run tests, using the CLI SAPI
%if %{with make_test}
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 LANG=POSIX LC_ALL=POSIX
