Try #2 for fixing build of www/webkit2-gtk3 on armv6 by matching the …

…correct define and disabling the JIT compiler. PR: 207275 Submitted by: mikael.urankar@gmail.com Reported by: sbruno Reviewed by: bdrewery (implicit) Approved by: maintainer timeout
pfsense · Sep 25, 2016 · 91c5b2c · 91c5b2c
1 parent 4a7dd35
commit 91c5b2c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile
@@ -55,6 +55,10 @@ DEBUG_CMAKE_OFF=	-DCMAKE_BUILD_TYPE=Release
 
 .include <bsd.port.options.mk>
 
+.if ${ARCH} == armv6
+CMAKE_ARGS+=	-DENABLE_JIT:BOOL=OFF
+.endif
+
 .if ${ARCH} == powerpc64
 CFLAGS+=	-mminimal-toc
 .endif

diff --git a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h
@@ -0,0 +1,18 @@
+--- Source/WTF/wtf/Platform.h.orig	2016-07-20 UTC
++++ Source/WTF/wtf/Platform.h
+@@ -218,6 +218,7 @@
+ #elif defined(__ARM_ARCH_6__) \
+     || defined(__ARM_ARCH_6J__) \
+     || defined(__ARM_ARCH_6K__) \
++    || defined(__ARM_ARCH_6KZ__) \
+     || defined(__ARM_ARCH_6Z__) \
+     || defined(__ARM_ARCH_6ZK__) \
+     || defined(__ARM_ARCH_6T2__) \
+@@ -264,6 +265,7 @@
+
+ #elif defined(__ARM_ARCH_6J__) \
+     || defined(__ARM_ARCH_6K__) \
++    || defined(__ARM_ARCH_6KZ__) \
+     || defined(__ARM_ARCH_6Z__) \
+     || defined(__ARM_ARCH_6ZK__) \
+     || defined(__ARM_ARCH_6M__)