[packages/php-pecl-solr] fix build on php 7.4

glen glen at pld-linux.org
Wed Aug 7 21:43:06 CEST 2019


commit 9c976421f2e4b3846f8c5314f577abca4e66d07d
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Aug 7 15:57:43 2019 +0300

    fix build on php 7.4

 php-pecl-solr.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/php-pecl-solr.spec b/php-pecl-solr.spec
index 90003d2..acd3892 100644
--- a/php-pecl-solr.spec
+++ b/php-pecl-solr.spec
@@ -9,7 +9,7 @@ Summary:	Object oriented API to Apache Solr
 Summary(fr.UTF-8):	API orientée objet pour Apache Solr
 Name:		%{php_name}-pecl-solr
 Version:	2.5.0
-Release:	1
+Release:	2
 License:	PHP v3.01
 Group:		Development/Languages
 Source0:	https://pecl.php.net/get/%{modname}-%{version}.tgz
@@ -88,7 +88,11 @@ cat <<'EOF' > run-tests.sh
 export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
 exec %{__make} test \
 	PHP_EXECUTABLE=%{__php} \
+%if "%php_major_version.%php_minor_version" >= "7.4"
+	PHP_TEST_SHARED_SYSTEM_EXTENSIONS="json" \
+%else
 	PHP_TEST_SHARED_SYSTEM_EXTENSIONS="json pcre" \
+%endif
 	RUN_TESTS_SETTINGS="-q $*"
 EOF
 chmod +x run-tests.sh
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-solr.git/commitdiff/9c976421f2e4b3846f8c5314f577abca4e66d07d



More information about the pld-cvs-commit mailing list