Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Jun 2017 09:58:11 +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: r442468 - in head/devel/qt5-script: . files
Message-ID:  <201706030958.v539wBcP046842@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Sat Jun  3 09:58:11 2017
New Revision: 442468
URL: https://svnweb.freebsd.org/changeset/ports/442468

Log:
  Fix build on armv6.
  
  PR:		216736
  Submitted by:	Mikaƫl Urankar <mikael.urankar at gmail.com>

Added:
  head/devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h   (contents, props changed)
Modified:
  head/devel/qt5-script/Makefile

Modified: head/devel/qt5-script/Makefile
==============================================================================
--- head/devel/qt5-script/Makefile	Sat Jun  3 09:01:20 2017	(r442467)
+++ head/devel/qt5-script/Makefile	Sat Jun  3 09:58:11 2017	(r442468)
@@ -2,6 +2,7 @@
 
 PORTNAME=	script
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Added: head/devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h	Sat Jun  3 09:58:11 2017	(r442468)
@@ -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__)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706030958.v539wBcP046842>