git: 46124cf7ab6b - main - devel/pcre2: Add/rm forgotten patches
Date: Thu, 06 Feb 2025 09:40:21 UTC
The branch main has been updated by krion:
URL: https://cgit.FreeBSD.org/ports/commit/?id=46124cf7ab6bea21278475a4f9de8d2763b66537
commit 46124cf7ab6bea21278475a4f9de8d2763b66537
Author: Kirill Ponomarev <krion@FreeBSD.org>
AuthorDate: 2025-02-06 09:40:08 +0000
Commit: Kirill Ponomarev <krion@FreeBSD.org>
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__)
-
- /*