From 35c1961fa8688bc4335a429731f86b2eef9b6410 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Sat, 4 Jan 2025 18:05:36 +0000 Subject: [PATCH] fix(main/php): Fix pcre2 linking with php-pgsql extension --- packages/php/build.sh | 1 + packages/php/ext-pgsql-config.m4.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 packages/php/ext-pgsql-config.m4.patch diff --git a/packages/php/build.sh b/packages/php/build.sh index a28bcf5fa1..45c2380fe2 100644 --- a/packages/php/build.sh +++ b/packages/php/build.sh @@ -5,6 +5,7 @@ TERMUX_PKG_LICENSE_FILE=LICENSE TERMUX_PKG_MAINTAINER="@termux" # Please revbump php-* extensions along with "minor" bump (e.g. 8.1.x to 8.2.0) TERMUX_PKG_VERSION="8.4.1" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/php/php-src/archive/php-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=490df36775b2edbefb586ecb38cb4cd781fb05ac01794a345fc1269cca10792b TERMUX_PKG_AUTO_UPDATE=false diff --git a/packages/php/ext-pgsql-config.m4.patch b/packages/php/ext-pgsql-config.m4.patch new file mode 100644 index 0000000000..fc67d7cefb --- /dev/null +++ b/packages/php/ext-pgsql-config.m4.patch @@ -0,0 +1,14 @@ +Link with pcre2 library explicitly. Otherwise, the following error is shown at runtime. +dlopen failed: cannot locate symbol "pcre2_match_8" referenced by "$PREFIX/lib/php/pgsql.so" + +--- a/ext/pgsql/config.m4 ++++ b/ext/pgsql/config.m4 +@@ -7,6 +7,8 @@ + the libpq paths.])]) + + if test "$PHP_PGSQL" != "no"; then ++ PGSQL_SHARED_LIBADD=-lpcre2-8 ++ PHP_SUBST(PGSQL_SHARED_LIBADD) + PHP_SETUP_PGSQL([PGSQL_SHARED_LIBADD],,, [$PHP_PGSQL]) + PHP_SUBST([PGSQL_SHARED_LIBADD]) +