From nobody Thu Feb 06 09:40:21 2025 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 4YpXCB0bM5z5nMZ2; Thu, 06 Feb 2025 09:40:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpXC964yMz3V1H; Thu, 06 Feb 2025 09:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738834821; 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=tJ3Y0IDqF2yXLXJcCx0LtbD4EBajzPJ/WG8y065FbDU=; b=IJwegrNBfOWxZD5HfhzWYcaJSLlqjFVorOAITEqaLbLULo5iRq0xk4rivDIIRW52cH59ec n/OclozzCe8Rqt/d3201lrXwDpwk8gqQoBVdX2W7HbhkLFeGfWztvlaAGYFHqBhXDxyV5D xd1e19mhzPuVpDfyxdwbfxZJzrybfUzfAV/D+VFka7ZVTfv/1ib5HhPwOonOXeoFkUYoeL cWZbOt9KbAFK9QzhNtEmaXeNwVAi5YtRRZxJtAkST5UU+rM8chFLHL+fATUzeJD4e190o1 w2MBGgXxAXrDiBxpO/bHN67RDHwIVv8MvxeAwESMlUJCMkMJ2MVzVqaYvZnKiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738834821; 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=tJ3Y0IDqF2yXLXJcCx0LtbD4EBajzPJ/WG8y065FbDU=; b=Y2MrbEeX/DQPdcTzHu1sSSDK5B3yHF2nRACgGSSVcC40KsuqKlHjbhWSjLYvK+uBbyPSdx IUj2MuczGG6DIPMlhVWrUAuttPQrkJdpUGj1Lj+gEgv8I5svghtwqIHYD+6KpVBVlUiWUg yeOiwEWvYFl+iqWjY5EGzXcr+Xp9W4iTjVE0BRXbbhbBpyHrqyqGoj9DdhYg8HuoUz/nkA abGw9tpMNKBmhjCEtkFwMttLllczHP8kxiwx2CC3guKZ6iHR7LI1/BmmCVpm41g7PC8CRJ kMH+qvKNlAaMxfTlvebK8MeWtr+60MlOWO/xvLir4BGWZlm2p6Pz2FIDxr09+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738834821; a=rsa-sha256; cv=none; b=GOVTkTb8za6grjb/24YtVCk/QK6lBqyWZT4XvR9yWk6mcNjsWSt4DloXZpbV45iyVpcATt 66advZvjg6t2GGylNEg8cGofpzOJ7mLd4agYkYviD2aYXIzFBGicrBvi0QXWCU19B8WhK0 gCjMmnJ6UXRyceMTwFFwnJO3OnyTF4LyUTVzXc0pbGbGld1pr7igLldtrXHkA9cViiYJ6b YWMxRFsQJCkcbvOGUD2uCWjw4QI+9zb1pHyHcbJ+0XDR41jTcMCDG/JVs4i7PwPuAO/hyI z5I4/M9HtmkEGdk/zyBCICJp29W/MxaRJJkrnePAwngfJHqi5tkG0mBZcL7Wfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpXC95JJ0zYmp; Thu, 06 Feb 2025 09:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5169eLdM035796; Thu, 6 Feb 2025 09:40:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5169eLPK035793; Thu, 6 Feb 2025 09:40:21 GMT (envelope-from git) Date: Thu, 6 Feb 2025 09:40:21 GMT Message-Id: <202502060940.5169eLPK035793@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kirill Ponomarev Subject: git: 46124cf7ab6b - main - devel/pcre2: Add/rm forgotten patches 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46124cf7ab6bea21278475a4f9de8d2763b66537 Auto-Submitted: auto-generated The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=46124cf7ab6bea21278475a4f9de8d2763b66537 commit 46124cf7ab6bea21278475a4f9de8d2763b66537 Author: Kirill Ponomarev AuthorDate: 2025-02-06 09:40:08 +0000 Commit: Kirill Ponomarev CommitDate: 2025-02-06 09:40:08 +0000 devel/pcre2: Add/rm forgotten patches --- devel/pcre2/files/patch-Makefile.am | 11 ----------- .../files/patch-deps_sljit_sljit__src_sljitConfigInternal.h | 11 +++++++++++ devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h | 11 ----------- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/devel/pcre2/files/patch-Makefile.am b/devel/pcre2/files/patch-Makefile.am deleted file mode 100644 index 0aa4d5525f67..000000000000 --- a/devel/pcre2/files/patch-Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2015-08-25 16:56:39 UTC -+++ Makefile.am -@@ -646,7 +646,7 @@ EXTRA_DIST += src/pcre2demo.c - - # We have .pc files for pkg-config users. - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(libdir)data/pkgconfig - pkgconfig_DATA = - - if WITH_PCRE2_8 diff --git a/devel/pcre2/files/patch-deps_sljit_sljit__src_sljitConfigInternal.h b/devel/pcre2/files/patch-deps_sljit_sljit__src_sljitConfigInternal.h new file mode 100644 index 000000000000..67ebc2b80ddc --- /dev/null +++ b/devel/pcre2/files/patch-deps_sljit_sljit__src_sljitConfigInternal.h @@ -0,0 +1,11 @@ +--- deps/sljit/sljit_src/sljitConfigInternal.h.orig 2025-02-06 07:15:34 UTC ++++ deps/sljit/sljit_src/sljitConfigInternal.h +@@ -255,7 +255,7 @@ extern "C" { + * system provided method that should be defined below is used + * instead. + */ +-#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) && !defined(__clang__) + + /* diff --git a/devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h b/devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h deleted file mode 100644 index 7d14d71c3d86..000000000000 --- a/devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/sljit/sljitConfigInternal.h.orig 2022-05-02 15:22:09 UTC -+++ src/sljit/sljitConfigInternal.h -@@ -333,7 +333,7 @@ extern "C" { - * beware APPLE is known to have removed the code in iOS so - * it will need to be excempted or result in broken builds - */ --#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) && !defined(__clang__) - - /*