diff options
| author | Remi Collet <remi@remirepo.net> | 2021-09-30 17:27:14 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-09-30 17:27:14 +0200 |
| commit | 55388a3d927791190be2a3d05de080210f0a9799 (patch) | |
| tree | 2fb7e9702b72e7fcf6c0e41871f554cd8630048c | |
| parent | a6b166e93f5b05408bf9f94fe3dd0bef0d68dd54 (diff) | |
fix F35 build adding libresolv to linked libraries
| -rw-r--r-- | 0001-link-with-libresolv-for-ns_parserr.patch | 24 | ||||
| -rw-r--r-- | php-pecl-mysql-xdevapi.spec | 18 |
2 files changed, 35 insertions, 7 deletions
diff --git a/0001-link-with-libresolv-for-ns_parserr.patch b/0001-link-with-libresolv-for-ns_parserr.patch new file mode 100644 index 0000000..05e161b --- /dev/null +++ b/0001-link-with-libresolv-for-ns_parserr.patch @@ -0,0 +1,24 @@ +From edcb19e0f996a505025b4b4821db4e4b3e249220 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Thu, 30 Sep 2021 16:48:48 +0200 +Subject: [PATCH] link with libresolv for ns_parserr + +--- + config.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.m4 b/config.m4 +index e96b9703..d40844f6 100644 +--- a/config.m4 ++++ b/config.m4 +@@ -439,6 +439,7 @@ if test "$PHP_MYSQL_XDEVAPI" != "no" || test "$PHP_MYSQL_XDEVAPI_ENABLED" == "ye + fi + AC_MSG_RESULT($MYSQL_XDEVAPI_PROTOBUF_INCLUDES) + ++ PHP_CHECK_LIBRARY(resolv, ns_parserr, [PHP_ADD_LIBRARY(resolv, 1, MYSQL_XDEVAPI_SHARED_LIBADD)]) + + dnl compressors + MYSQL_XDEVAPI_RESOLVE_COMPRESSOR("$PHP_LZ4", "lz4", "lz4", "LZ4F_createCompressionContext", "lz4.h", "MYSQL_XDEVAPI_HAVE_LZ4", IS_LZ4_ENABLED) +-- +2.31.1 + 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 |