summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-06-16 17:25:29 +0200
committerRemi Collet <remi@php.net>2022-06-16 17:25:29 +0200
commitecc2bd63be0045d4870f43f5fdc7f1b35f60f9e7 (patch)
tree1b0df6b14dcc5a36c2a2fec103e061b43f449bb3
parent9db3d9d8ecc38f2d547434f1edd213dd202abe30 (diff)
synced with fork version 1.3.7
-rw-r--r--141.patch4
-rw-r--r--php-pecl-cassandra.spec1
2 files changed, 3 insertions, 2 deletions
diff --git a/141.patch b/141.patch
index e2aee7d..f092765 100644
--- a/141.patch
+++ b/141.patch
@@ -1,9 +1,10 @@
-From f850bea77c036e59a220a976ce3564fb2dd08a1e Mon Sep 17 00:00:00 2001
+From 659f25381a4fba9cf2d8a8c803d81e80fa7d5fcd Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 15 Jan 2020 10:17:42 +0100
Subject: [PATCH] use pkg-config and allow build when cpp-driver use
CASS_INSTALL_HEADER_IN_SUBDIR
+(cherry picked from commit f850bea77c036e59a220a976ce3564fb2dd08a1e)
---
ext/config.m4 | 60 ++++++++++++++++++++++++++++++++++-----------------
1 file changed, 40 insertions(+), 20 deletions(-)
@@ -94,4 +95,3 @@ index d479d904..3c9abdc5 100644
fi
PHP_ADD_LIBRARY(cassandra,, CASSANDRA_SHARED_LIBADD)
-
diff --git a/php-pecl-cassandra.spec b/php-pecl-cassandra.spec
index 533172b..c6a5e07 100644
--- a/php-pecl-cassandra.spec
+++ b/php-pecl-cassandra.spec
@@ -248,6 +248,7 @@ REPORT_EXIT_STATUS=1 \
https://github.com/nano-interactive/cassandra-php-driver/
- add patch for PHP 8.1 from
https://github.com/nano-interactive/cassandra-php-driver/pull/29
+- synced with fork version 1.3.7
* Wed Jan 15 2020 Remi Collet <remi@remirepo.net> - 1.3.2-9
- fix for cassandra-cpp-driver 2.15.0 with new headers location