From 43f43058e4f9d929419d33ef2fbb657595989a26 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 24 Jun 2019 22:46:15 +0200
Subject: [PATCH] php: Link opcache.so against libpcre2-8

Fixes #3741.
---
 packages/php/build.sh                    |  1 +
 packages/php/ext-opcache-config.m4.patch | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/php/build.sh b/packages/php/build.sh
index e607ac683..d6a549b2e 100644
--- a/packages/php/build.sh
+++ b/packages/php/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://php.net
 TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
 TERMUX_PKG_LICENSE="PHP-3.0"
 TERMUX_PKG_VERSION=7.3.6
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=fefc8967daa30ebc375b2ab2857f97da94ca81921b722ddac86b29e15c54a164
 TERMUX_PKG_SRCURL=https://secure.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz
 # Build native php for phar to build (see pear-Makefile.frag.patch):
diff --git a/packages/php/ext-opcache-config.m4.patch b/packages/php/ext-opcache-config.m4.patch
index a7d8f330b..738d9e8a0 100644
--- a/packages/php/ext-opcache-config.m4.patch
+++ b/packages/php/ext-opcache-config.m4.patch
@@ -1,6 +1,6 @@
-diff -u -r ../php-7.3.2/ext/opcache/config.m4 ./ext/opcache/config.m4
---- ../php-7.3.2/ext/opcache/config.m4	2019-02-05 13:10:04.000000000 +0000
-+++ ./ext/opcache/config.m4	2019-02-09 01:48:59.965492259 +0000
+diff -u -r ../php-7.3.6/ext/opcache/config.m4 ./ext/opcache/config.m4
+--- ../php-7.3.6/ext/opcache/config.m4	2019-05-28 09:33:00.000000000 +0000
++++ ./ext/opcache/config.m4	2019-06-24 20:40:39.725791000 +0000
 @@ -145,7 +145,9 @@
  }
  ]])],[dnl
@@ -12,3 +12,13 @@ diff -u -r ../php-7.3.2/ext/opcache/config.m4 ./ext/opcache/config.m4
    AC_MSG_RESULT([$msg])
  
    AC_MSG_CHECKING(for mmap() using /dev/zero shared memory support)
+@@ -379,6 +381,9 @@
+ 	Optimizer/zend_dump.c,
+ 	shared,,-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,,yes)
+ 
++  OPCACHE_SHARED_LIBADD=-lpcre2-8
++  PHP_SUBST(OPCACHE_SHARED_LIBADD)
++
+   PHP_ADD_BUILD_DIR([$ext_builddir/Optimizer], 1)
+   PHP_ADD_EXTENSION_DEP(opcache, pcre)
+ fi