[patch] Proposed ebuild patch

pcre-jit.patch (text/plain), 1.41 KB, created by digitalteacup on 2021-01-10 18:59:37 UTC

diff --git a/php-8.0.1.ebuild b/php-8.0.1.ebuild
index bda8c36..47b9cbc 100644
--- a/php-8.0.1.ebuild
+++ b/php-8.0.1.ebuild
@@ -39,7 +39,7 @@ IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
 	+flatfile ftp gd gdbm gmp +iconv imap inifile
 	intl iodbc ipv6 kerberos ldap ldap-sasl libedit libressl lmdb
 	mhash mssql mysql mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	oci8-instant-client odbc +opcache pcre-jit pcntl pdo +phar +posix postgres qdbm
 	readline selinux +session session-mm sharedmem
 	+simplexml snmp soap sockets sodium spell sqlite ssl
 	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
@@ -108,6 +108,7 @@ COMMON_DEPEND="
 	nls? ( sys-devel/gettext )
 	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
 	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	pcre-jit? ( dev-libs/libpcre2[jit] )
 	postgres? ( >=dev-db/postgresql-9.1:* )
 	qdbm? ( dev-db/qdbm )
 	readline? ( sys-libs/readline:0= )
@@ -409,11 +410,12 @@ src_configure() {
 
 	# we use the system copy of pcre
 	# --with-external-pcre affects ext/pcre
-	# Many arches don't support pcre-jit
-	our_conf+=(
-		--with-external-pcre
-		--without-pcre-jit
-	)
+	our_conf+=( --with-external-pcre )
+
+	# Disable PCRE JIT unless requested
+	if ! use pcre-jit ; then
+		our_conf+=( --without-pcre-jit )
+	fi
 
 	# Catch CFLAGS problems
 	# Fixes bug #14067.