diff mbox series

[1/2] config.mak.uname: remove redundant NO_LIBPCRE1_JIT flag

Message ID 20210124015833.2753-1-avarab@gmail.com (mailing list archive)
State Accepted
Commit 0205bb13d0f506136ef4134d1cbf69b3a8a1a2a0
Headers show
Series [1/2] config.mak.uname: remove redundant NO_LIBPCRE1_JIT flag | expand

Commit Message

Ævar Arnfjörð Bjarmason Jan. 24, 2021, 1:58 a.m. UTC
Remove a flag added in my fb95e2e38d (grep: un-break building with
PCRE >= 8.32 without --enable-jit, 2017-06-01). It's set just below
USE_LIBPCRE=YesPlease, so it's been redundant since
e6c531b808 (Makefile: make USE_LIBPCRE=YesPlease mean v2, not v1,
2018-03-11).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 config.mak.uname | 1 -
 1 file changed, 1 deletion(-)

Comments

Johannes Schindelin Jan. 28, 2021, 3:44 p.m. UTC | #1
Hi Ævar,

On Sun, 24 Jan 2021, Ævar Arnfjörð Bjarmason wrote:

> Remove a flag added in my fb95e2e38d (grep: un-break building with
> PCRE >= 8.32 without --enable-jit, 2017-06-01). It's set just below
> USE_LIBPCRE=YesPlease, so it's been redundant since
> e6c531b808 (Makefile: make USE_LIBPCRE=YesPlease mean v2, not v1,
> 2018-03-11).
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>  config.mak.uname | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/config.mak.uname b/config.mak.uname
> index 198ab1e58f..e22d4b6d67 100644
> --- a/config.mak.uname
> +++ b/config.mak.uname
> @@ -664,7 +664,6 @@ else
>  		NO_GETTEXT =
>  		USE_GETTEXT_SCHEME = fallthrough
>  		USE_LIBPCRE= YesPlease
> -		NO_LIBPCRE1_JIT = UnfortunatelyYes

FWIW this is almost precisely what we carry in Git for Windows for a while
(to battle-test it), as
https://github.com/git-for-windows/git/commit/735a58a38d43659cb985d717ec7eda1f26e121e5

The only thing that commit does in addition is to insert the forgotten
space in the line above, between `USE_LIBPCRE` and `=`.

Thanks,
Dscho

>  		NO_CURL =
>  		USE_NED_ALLOCATOR = YesPlease
>  	else
> --
> 2.29.2.222.g5d2a92d10f8
>
>
diff mbox series

Patch

diff --git a/config.mak.uname b/config.mak.uname
index 198ab1e58f..e22d4b6d67 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -664,7 +664,6 @@  else
 		NO_GETTEXT =
 		USE_GETTEXT_SCHEME = fallthrough
 		USE_LIBPCRE= YesPlease
-		NO_LIBPCRE1_JIT = UnfortunatelyYes
 		NO_CURL =
 		USE_NED_ALLOCATOR = YesPlease
 	else