Date: Sat, 3 Jun 2017 10:06:10 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r442470 - in head/lang/qt5-qml: . files Message-ID: <201706031006.v53A6Avf051301@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat Jun 3 10:06:10 2017 New Revision: 442470 URL: https://svnweb.freebsd.org/changeset/ports/442470 Log: Fix build on armv6 PR: 216735 Submitted by: Mikaël Urankar <mikael.urankar at gmail.com> Added: head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h (contents, props changed) head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h (contents, props changed) head/lang/qt5-qml/files/patch-src_3rdparty_masm_wtf_Platform.h (contents, props changed) Modified: head/lang/qt5-qml/Makefile Modified: head/lang/qt5-qml/Makefile ============================================================================== --- head/lang/qt5-qml/Makefile Sat Jun 3 09:59:13 2017 (r442469) +++ head/lang/qt5-qml/Makefile Sat Jun 3 10:06:10 2017 (r442470) @@ -2,6 +2,7 @@ PORTNAME= qml DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= lang PKGNAMEPREFIX= qt5- Added: head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h Sat Jun 3 10:06:10 2017 (r442470) @@ -0,0 +1,11 @@ +--- src/3rdparty/masm/assembler/ARMAssembler.h.orig 2017-02-02 10:26:18 UTC ++++ src/3rdparty/masm/assembler/ARMAssembler.h +@@ -1069,6 +1069,8 @@ namespace JSC { + UNUSED_PARAM(size); + #elif OS(QNX) + msync(code, size, MS_INVALIDATE_ICACHE); ++#elif OS(FREEBSD) && COMPILER(CLANG) ++ __clear_cache(code, reinterpret_cast<char*>(code) + size); + #else + #error "The cacheFlush support is missing on this platform." + #endif Added: head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h Sat Jun 3 10:06:10 2017 (r442470) @@ -0,0 +1,11 @@ +--- src/3rdparty/masm/assembler/ARMv7Assembler.h.orig 2016-09-12 04:21:49 UTC ++++ src/3rdparty/masm/assembler/ARMv7Assembler.h +@@ -2311,6 +2311,8 @@ public: + UNUSED_PARAM(code); + UNUSED_PARAM(size); + #endif ++#elif OS(FREEBSD) && COMPILER(CLANG) ++ __clear_cache(code, reinterpret_cast<char*>(code) + size); + #else + #error "The cacheFlush support is missing on this platform." + #endif Added: head/lang/qt5-qml/files/patch-src_3rdparty_masm_wtf_Platform.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/qt5-qml/files/patch-src_3rdparty_masm_wtf_Platform.h Sat Jun 3 10:06:10 2017 (r442470) @@ -0,0 +1,17 @@ +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/masm/wtf/Platform.h.orig 2017-02-02 09:31:51 UTC ++++ src/3rdparty/masm/wtf/Platform.h +@@ -211,6 +211,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__) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706031006.v53A6Avf051301>