From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 6 Mar 2021 11:04:09 +0000 (+0000)
Subject: pcre2: Disable JIT for RISC-V
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0708148f5956c4c8efc5d7f0819b0ac84e51e4e;p=people%2Fms%2Fipfire-2.x.git

pcre2: Disable JIT for RISC-V

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/pcre2 b/lfs/pcre2
index d5d6c8e950..c2042e9022 100644
--- a/lfs/pcre2
+++ b/lfs/pcre2
@@ -32,6 +32,20 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+CONFIGURE_ARGS = \
+	--prefix=/usr \
+	--disable-static \
+	--enable-unicode \
+	--enable-pcre2-16 \
+	--enable-pcre2-32 \
+	--docdir=/usr/share/doc/pcre-$(THISAPP)
+
+ifeq "$(BUILD_ARCH)" "riscv64"
+	CONFIGURE_ARGS += --disable-jit
+else
+	CONFIGURE_ARGS += --enable-jit
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -70,14 +84,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure \
-		--prefix=/usr \
-		--disable-static \
-		--enable-unicode \
-		--enable-jit \
-		--enable-pcre2-16 \
-		--enable-pcre2-32 \
-		--docdir=/usr/share/doc/pcre-$(THISAPP)
+	cd $(DIR_APP) && ./configure $(CONFIGURE_ARGS)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)