From nobody Fri Mar 25 14:38:40 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 053AE1A4B0EF; Fri, 25 Mar 2022 14:38:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KQ4TX5DtJz4tLn; Fri, 25 Mar 2022 14:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648219120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KRyWiiOHrhI0dcF03YgjfHe5E7/dCeeliSe1yRrW6LI=; b=aEApeLhwFpFaoEz0SgTFQSkRgaIdKgoDWGuqMQU7xRw1qYa8DKTW6NO6Rkxi9ETTRjEzZz R9TQvSgw7mDycvsL3RaernVnalEc1FpdsjpV0782VxC0DtQLkPmVna9SudwblzXb+CDZaI fzzGKNQHYzxnh35VBQPTy1nD5XLJT+IpSKUxxgna0mIijc6jzQ0XunaGT/Nm/IJajbJvF+ OoCUO3ZR2xrlqG/nEZImC3p31JsVwhv5RQcM9o7X6PfPEkrDYoaet+r2PJCGuwlLF+DEVB iHZXmpFSKoGmWjpf+yWZCourjscfpGWlid30uNI0nqb3a5K80Qu3k2NacrPX3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6C5C863FA; Fri, 25 Mar 2022 14:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22PEceEM000109; Fri, 25 Mar 2022 14:38:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PEceG3000108; Fri, 25 Mar 2022 14:38:40 GMT (envelope-from git) Date: Fri, 25 Mar 2022 14:38:40 GMT Message-Id: <202203251438.22PEceG3000108@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: b6bb44e5ba88 - main - pcre: fix runtime issues on powerpc List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6bb44e5ba8832aa575c28a13cef3ea2c9edc8b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648219120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KRyWiiOHrhI0dcF03YgjfHe5E7/dCeeliSe1yRrW6LI=; b=d06WQ9kv9urGg6eL5XyxGHS5rhcT7Wk00scjgaQVmD1BxegtlgUe23wzmPc52hOMzm5tZ3 Zog/IkLsXGDLeujNqisHM2toGibm0Ap7wHp1IKYIti5rRk0KiN61ObtLB9VQgQeQugdU8G vpiy5IU8ac3OrkVDPW9kQeb7yG6TVrgEWo5coAUVxy38a34YhWTOfYtDIbtjz5jbZXK6sD w5NGzIpNJNxG3ApAfurbw5XTRPRCwN8PtC1VIbL/pmr9yXENGliC60zenFprmUNxHS9Ito wKxLZVEiovbDg8+9ZV1Z6I34uaHe/k1S52QM10fHBvbbpy2Rvp4CtjaifQoujw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648219120; a=rsa-sha256; cv=none; b=pb1iGTW1X4hSxWmwGszueXFZldOAorgAvjwKdA8IScLJBrUW0FcJIAEE0k3PQwmg1Ly5Gg 0HFDEruuKbVHM1DQorKip8aIedBpROLqaezHmgD1OHhkKV/rVqOKttkJKG+2BZ07+VVSe0 bBQd/pq6i2s1G/FknFwKHj4hGdvQ2C0Hzg+e0nn4PRGAgSQE/oMbAmYxn2gFmVyLndV3w2 NkHXQRF5LvgnWL9n6UmpgmOAACS5E03rHzoujeL0cPoBQak+kCgf2IfNR8vQE7NwW97X3c pEgYJ+U783RKobnsBj4LbrxWYG3kWDQVlx1DQKlmpFUqRDCh3k/PYDtwjlgePA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6bb44e5ba8832aa575c28a13cef3ea2c9edc8b6 commit b6bb44e5ba8832aa575c28a13cef3ea2c9edc8b6 Author: Piotr Kubaj AuthorDate: 2022-03-25 14:29:03 +0000 Commit: Piotr Kubaj CommitDate: 2022-03-25 14:29:03 +0000 pcre: fix runtime issues on powerpc In sljitConfigInternal.h, pcre checks for existence of __builtin___clear_cache() function. LLVM provides that function for all platforms, even those that don't have implemented flushing the cache. This leads to runtime errors on e.g. powerpc (32-bit) with __clear_cache() calling compilerrt_abort(), resulting in SIGABRT. --- devel/pcre/Makefile | 1 + devel/pcre/files/patch-sljit_sljitConfigInternal.h | 11 +++++++++++ devel/pcre2/Makefile | 1 + devel/pcre2/files/patch-sljit_sljitConfigInternal.h | 11 +++++++++++ lang/php74/Makefile | 2 +- .../files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h | 11 +++++++++++ lang/php80/Makefile | 2 +- .../files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h | 11 +++++++++++ lang/php81/Makefile | 2 +- .../files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h | 11 +++++++++++ 10 files changed, 60 insertions(+), 3 deletions(-) diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index 90419f360f41..f16c178e08dd 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -2,6 +2,7 @@ PORTNAME= pcre PORTVERSION= 8.45 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://ftp.pcre.org/pub/pcre/ \ SF diff --git a/devel/pcre/files/patch-sljit_sljitConfigInternal.h b/devel/pcre/files/patch-sljit_sljitConfigInternal.h new file mode 100644 index 000000000000..a8b0b81da719 --- /dev/null +++ b/devel/pcre/files/patch-sljit_sljitConfigInternal.h @@ -0,0 +1,11 @@ +--- sljit/sljitConfigInternal.h.orig 2022-03-25 09:54:56 UTC ++++ sljit/sljitConfigInternal.h +@@ -283,7 +283,7 @@ + /* Instruction cache flush. */ + /****************************/ + +-#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin) ++#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin && !defined SLJIT_CONFIG_PPC_32) + #if __has_builtin(__builtin___clear_cache) + + #define SLJIT_CACHE_FLUSH(from, to) \ diff --git a/devel/pcre2/Makefile b/devel/pcre2/Makefile index cd3070e986df..66ef4f909a30 100644 --- a/devel/pcre2/Makefile +++ b/devel/pcre2/Makefile @@ -2,6 +2,7 @@ PORTNAME= pcre2 PORTVERSION= 10.39 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= krion@FreeBSD.org diff --git a/devel/pcre2/files/patch-sljit_sljitConfigInternal.h b/devel/pcre2/files/patch-sljit_sljitConfigInternal.h new file mode 100644 index 000000000000..a8b0b81da719 --- /dev/null +++ b/devel/pcre2/files/patch-sljit_sljitConfigInternal.h @@ -0,0 +1,11 @@ +--- sljit/sljitConfigInternal.h.orig 2022-03-25 09:54:56 UTC ++++ sljit/sljitConfigInternal.h +@@ -283,7 +283,7 @@ + /* Instruction cache flush. */ + /****************************/ + +-#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin) ++#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin && !defined SLJIT_CONFIG_PPC_32) + #if __has_builtin(__builtin___clear_cache) + + #define SLJIT_CACHE_FLUSH(from, to) \ diff --git a/lang/php74/Makefile b/lang/php74/Makefile index 5bbac616954c..b957bc16d171 100644 --- a/lang/php74/Makefile +++ b/lang/php74/Makefile @@ -1,6 +1,6 @@ PORTNAME= php74 DISTVERSION= 7.4.28 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= PHP DISTNAME= php-${DISTVERSION} diff --git a/lang/php74/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h b/lang/php74/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h new file mode 100644 index 000000000000..9a75bc3e86c1 --- /dev/null +++ b/lang/php74/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h @@ -0,0 +1,11 @@ +--- ext/pcre/pcre2lib/sljit/sljitConfigInternal.h.orig 2022-03-25 09:54:56 UTC ++++ ext/pcre/pcre2lib/sljit/sljitConfigInternal.h +@@ -283,7 +283,7 @@ + /* Instruction cache flush. */ + /****************************/ + +-#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin) ++#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin && !defined SLJIT_CONFIG_PPC_32) + #if __has_builtin(__builtin___clear_cache) + + #define SLJIT_CACHE_FLUSH(from, to) \ diff --git a/lang/php80/Makefile b/lang/php80/Makefile index abccb8e1b2e4..2e7019ee7fc1 100644 --- a/lang/php80/Makefile +++ b/lang/php80/Makefile @@ -1,6 +1,6 @@ PORTNAME= php80 DISTVERSION= 8.0.17 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= PHP DISTNAME= php-${DISTVERSION} diff --git a/lang/php80/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h b/lang/php80/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h new file mode 100644 index 000000000000..9a75bc3e86c1 --- /dev/null +++ b/lang/php80/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h @@ -0,0 +1,11 @@ +--- ext/pcre/pcre2lib/sljit/sljitConfigInternal.h.orig 2022-03-25 09:54:56 UTC ++++ ext/pcre/pcre2lib/sljit/sljitConfigInternal.h +@@ -283,7 +283,7 @@ + /* Instruction cache flush. */ + /****************************/ + +-#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin) ++#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin && !defined SLJIT_CONFIG_PPC_32) + #if __has_builtin(__builtin___clear_cache) + + #define SLJIT_CACHE_FLUSH(from, to) \ diff --git a/lang/php81/Makefile b/lang/php81/Makefile index 670df40197ca..85bfbbd4db87 100644 --- a/lang/php81/Makefile +++ b/lang/php81/Makefile @@ -1,6 +1,6 @@ PORTNAME= php81 DISTVERSION= 8.1.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${DISTVERSION} diff --git a/lang/php81/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h b/lang/php81/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h new file mode 100644 index 000000000000..9a75bc3e86c1 --- /dev/null +++ b/lang/php81/files/patch-ext_pcre_pcre2lib_sljit_sljitConfigInternal.h @@ -0,0 +1,11 @@ +--- ext/pcre/pcre2lib/sljit/sljitConfigInternal.h.orig 2022-03-25 09:54:56 UTC ++++ ext/pcre/pcre2lib/sljit/sljitConfigInternal.h +@@ -283,7 +283,7 @@ + /* Instruction cache flush. */ + /****************************/ + +-#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin) ++#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin && !defined SLJIT_CONFIG_PPC_32) + #if __has_builtin(__builtin___clear_cache) + + #define SLJIT_CACHE_FLUSH(from, to) \