Commit 6eee9112 authored by Andy Postnikov's avatar Andy Postnikov
Browse files

testing/php7-pecl-solr: upgrade to 2.5.1

parent 358c413b
......@@ -2,16 +2,15 @@
# Maintainer: Fabio Ribeiro <fabiorphp@gmail.com>
pkgname=php7-pecl-solr
_pkgreal=solr
pkgver=2.5.0
pkgrel=2
pkgver=2.5.1
pkgrel=0
pkgdesc="Apache SOLR extension for PHP"
url="https://pecl.php.net/package/solr"
arch="all"
license="PHP-3.01"
depends="php7-json"
makedepends="php7-dev curl-dev libxml2-dev pcre-dev"
makedepends="php7-dev curl-dev libxml2-dev"
source="$pkgname-$pkgver.tgz::https://pecl.php.net/get/$_pkgreal-$pkgver.tgz
fix-musl.patch
fix-tests.patch"
builddir="$srcdir"/$_pkgreal-$pkgver
provides="php7-solr=$pkgver-r$pkgrel" # for backward compatibility
......@@ -24,8 +23,9 @@ build() {
}
check() {
php7 -d extension="$builddir"/modules/$_pkgreal.so --ri $_pkgreal
php7 -d extension=modules/$_pkgreal.so --ri $_pkgreal
make NO_INTERACTION=1 REPORT_EXIT_STATUS=1 SKIP_ONLINE_TESTS=1 test \
TESTS='--show-diff' \
PHP_TEST_SHARED_EXTENSIONS=" \
-d extension=/usr/lib/php7/modules/json.so \
-d extension=modules/$_pkgreal.so"
......@@ -33,10 +33,10 @@ check() {
package() {
make INSTALL_ROOT="$pkgdir"/ install
install -d "$pkgdir"/etc/php7/conf.d
echo "extension=$_pkgreal.so" > "$pkgdir"/etc/php7/conf.d/40_$_pkgreal.ini
local _confdir=/etc/php7/conf.d
install -d "$pkgdir"$_confdir
echo "extension=$_pkgreal.so" > "$pkgdir"$_confdir/40_$_pkgreal.ini
}
sha512sums="5b24366942aa6eb0227da9d3d95bd0a9fd23a8163859e833c248cdab8f83391dc54df9fdae490ad9bc9bc5074b0b0c2c637918bc2f1738d5028f5e23c4d060cc php7-pecl-solr-2.5.0.tgz
4cd795db8597f9a7eaabd744e1531807e5a597bea05d2871fb452dd0c07ef22cbc0b55c68736986c147b0c23371d15412a9af35588acf1b8738e26c5cd337242 fix-musl.patch
sha512sums="b02711989455f3839e65835808dae66fdce6abfd85fe2cb3d46c4177deb2170b5993ee0c94177c880d3defac2d2c502b43d768b590b7180b5c38ab063f55bdf3 php7-pecl-solr-2.5.1.tgz
553503d194c8c8c4db065a4c21136e51d4ba8bb9a74327d312a6506e12d91b4d2b72c5082741e961df7f3852fecf2374333c8f00a173ca2e6e7e6f1049ecf6cb fix-tests.patch"
From 3f3fb4ec3546acdf80cc2957636d41de8d1a6cf4 Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Sat, 13 Jun 2020 02:02:55 +0300
Subject: [PATCH] Fix float parsing on musl
Using the zend strtod implementation fixes this.
---
src/php7/solr_functions_params.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/php7/solr_functions_params.c b/src/php7/solr_functions_params.c
index 584577f..1cdfce5 100644
--- a/src/php7/solr_functions_params.c
+++ b/src/php7/solr_functions_params.c
@@ -766,7 +766,7 @@ PHP_SOLR_API void solr_normal_param_value_display_double(solr_param_t *solr_para
{
solr_param_value_t *current_ptr = solr_param->head;
- double return_value = atof(current_ptr->contents.normal.str);
+ double return_value = zend_strtod(current_ptr->contents.normal.str, (const char **) NULL);
ZVAL_DOUBLE(param_value, return_value);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment