From a4fd743973a81c3fda8130d3861bb017f57db2cd Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Fri, 19 May 2023 09:45:11 +0200 Subject: [PATCH] grep: disable use of unsupported pcre JIT compilation Issue #4827 --- repos/ports/ports/grep.hash | 2 +- repos/ports/ports/grep.port | 3 +++ repos/ports/src/noux-pkg/grep/grep.patch | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 repos/ports/src/noux-pkg/grep/grep.patch diff --git a/repos/ports/ports/grep.hash b/repos/ports/ports/grep.hash index 0bec1d29bd..87c3df4dbb 100644 --- a/repos/ports/ports/grep.hash +++ b/repos/ports/ports/grep.hash @@ -1 +1 @@ -b96a88c916f9857523d285cfce0ad629687ed948 +445e6f860b8e92f2bede64ae2da65eb761e95111 diff --git a/repos/ports/ports/grep.port b/repos/ports/ports/grep.port index 2055a46825..58012624fa 100644 --- a/repos/ports/ports/grep.port +++ b/repos/ports/ports/grep.port @@ -7,3 +7,6 @@ SHA(grep) := db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e SIG(grep) := ${URL(grep)}.sig KEY(grep) := GNU DIR(grep) := src/noux-pkg/grep + +PATCHES := src/noux-pkg/grep/grep.patch +PATCH_OPT := -p1 -d ${DIR(grep)} diff --git a/repos/ports/src/noux-pkg/grep/grep.patch b/repos/ports/src/noux-pkg/grep/grep.patch new file mode 100644 index 0000000000..fb45fa36a9 --- /dev/null +++ b/repos/ports/src/noux-pkg/grep/grep.patch @@ -0,0 +1,16 @@ +grep.patch + +diff --git a/src/pcresearch.c b/src/pcresearch.c +index 43f91d0..cfe8839 100644 +--- a/src/pcresearch.c ++++ b/src/pcresearch.c +@@ -29,6 +29,9 @@ + in pcre_exec. */ + enum { NSUB = 300 }; + ++/* JIT compilation is currently not supported by Genode's pcre port */ ++#undef PCRE_STUDY_JIT_COMPILE ++ + # ifndef PCRE_STUDY_JIT_COMPILE + # define PCRE_STUDY_JIT_COMPILE 0 + # endif