From 55388a3d927791190be2a3d05de080210f0a9799 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 30 Sep 2021 17:27:14 +0200
Subject: fix F35 build adding libresolv to linked libraries

---
 php-pecl-mysql-xdevapi.spec | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'php-pecl-mysql-xdevapi.spec')

diff --git a/php-pecl-mysql-xdevapi.spec b/php-pecl-mysql-xdevapi.spec
index 946f069..a242b5b 100644
--- a/php-pecl-mysql-xdevapi.spec
+++ b/php-pecl-mysql-xdevapi.spec
@@ -25,12 +25,14 @@
 Summary:        MySQL database access functions
 Name:           %{?sub_prefix}php-pecl-mysql-xdevapi
 Version:        8.0.26
-Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 
 License:        PHP
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
+Patch0:         0001-link-with-libresolv-for-ns_parserr.patch
+
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?dtsprefix}gcc-c++
@@ -119,6 +121,7 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
+%patch0 -p1
 
 # Check version as upstream often forget to update this
 extver=$(sed -n '/#define PHP_MYSQL_XDEVAPI_VERSION/{s/.* "//;s/".*$//;p}' php_mysql_xdevapi.h)
@@ -197,11 +200,11 @@ done
 
 %check
 cd NTS
+OPT="-n -d extension=mysqlnd.so"
+[ -f %{php_extdir}/json.so ]     && OPT="$OPT -d extension=json.so"
 
 : Minimal load test for NTS extension
-%{_bindir}/php --no-php-ini \
-    --define extension=mysqlnd.so \
-    --define extension=json.so \
+%{_bindir}/php $OPT \
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
     --modules | grep '^%{pecl_name}$'
 
@@ -209,9 +212,7 @@ cd NTS
 cd ../ZTS
 
 : Minimal load test for ZTS extension
-%{__ztsphp} --no-php-ini \
-    --define extension=mysqlnd.so \
-    --define extension=json.so \
+%{__ztsphp} $OPT \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
     --modules | grep '^%{pecl_name}$'
 
@@ -307,6 +308,9 @@ fi
 
 
 %changelog
+* Thu Sep 30 2021 Remi Collet <remi@remirepo.net> - 8.0.26-2
+- fix F35 build adding libresolv to linked libraries
+
 * Wed Jul 21 2021 Remi Collet <remi@remirepo.net> - 8.0.26-1
 - update to 8.0.26
 
-- 
cgit