From 6092ba6c4f53d4668544045261fd610a69ecb818 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sat, 3 Jun 2017 09:58:11 +0000 Subject: [PATCH] Fix build on armv6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR: 216736 Submitted by: Mikaël Urankar --- devel/qt5-script/Makefile | 1 + ...vascriptcore_JavaScriptCore_wtf_Platform.h | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile index 75f45afe9b34..a479df32ec15 100644 --- a/devel/qt5-script/Makefile +++ b/devel/qt5-script/Makefile @@ -2,6 +2,7 @@ PORTNAME= script DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h b/devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h new file mode 100644 index 000000000000..147bf0e80741 --- /dev/null +++ b/devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h @@ -0,0 +1,26 @@ +Due to a misspelling in GCC [1] (probably) the check for the ARMv6KZ platform +used __ARM_ARCH_6ZK__ instead of __ARM_ARCH_6KZ__. + +Append the correct spellings to the checks for __ARM_ARCH_6ZK__. + + +[1] https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html + +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2017-02-02 14:03:08 UTC ++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -296,6 +296,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__) \ +@@ -326,6 +327,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__)