<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a499a38fd9cdfdc9cdf06622bcad2c73c4e5112b">https://github.com/macports/macports-ports/commit/a499a38fd9cdfdc9cdf06622bcad2c73c4e5112b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a499a38fd9cdfdc9cdf06622bcad2c73c4e5112b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Oct 18 08:35:31 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*-qtbase: don't duplicate Clang provided library
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Qt assumes that Intel's Intrinsics are not provided by Clang.
</span><span style='display:block; white-space:pre;color:#404040;'> This assumption is incorrect for recent versions of Clang.
</span><span style='display:block; white-space:pre;color:#404040;'> See
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/llvm/llvm-project/commit/e54093fcc0a651df14040a61fc8efdd338389afa
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/59364
</span>---
aqua/qt53/Portfile | 5 +++++
aqua/qt53/files/patch-qtbase-intel_intrinsics.diff | 11 +++++++++++
aqua/qt55/Portfile | 6 ++++++
aqua/qt55/files/patch-qtbase-intel_intrinsics.diff | 11 +++++++++++
aqua/qt56/Portfile | 6 ++++++
aqua/qt56/files/patch-qtbase-intel_intrinsics.diff | 11 +++++++++++
aqua/qt57/Portfile | 6 ++++++
aqua/qt57/files/patch-qtbase-intel_intrinsics.diff | 20 ++++++++++++++++++++
8 files changed, 76 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt53/Portfile b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b2a39af..63de562 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -736,6 +736,11 @@ foreach {module module_info} [array get modules] {
</span> # so we instead have to disable adding the SDK tool prefix in configure to allow MacPorts-installed compilers to be used
patchfiles-append patch-qt53-disable-macsdkify.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt assumes _bit_scan_reverse is not provided by Clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this assumption is incorrect for recent versions of Clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/llvm/llvm-project/commit/e54093fcc0a651df14040a61fc8efdd338389afa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59364
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtbase-intel_intrinsics.diff
</span>
#-----------------------------------------------------------------------------
# qtbase is used for:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt53/files/patch-qtbase-intel_intrinsics.diff b/aqua/qt53/files/patch-qtbase-intel_intrinsics.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..cb18f20
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt53/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/tools/qsimd_p.h.orig 2014-09-11 03:48:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qsimd_p.h 2019-10-16 11:28:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -260,7 +260,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _BitScanForward(&result, val);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && __GNUC__ * 100 + __GNUC_MINOR__ < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ((defined(Q_CC_CLANG) && __clang_major__ * 100 + __clang_minor__ < 900) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && __GNUC__ * 100 + __GNUC_MINOR__ < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Clang is missing the intrinsic for _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // GCC only added it in version 4.5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8721920..9b766b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -757,6 +757,12 @@ foreach {module module_info} [array get modules] {
</span> mkspecs/features/mac/rez.prf
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt assumes _bit_scan_reverse is not provided by Clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this assumption is incorrect for recent versions of Clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/llvm/llvm-project/commit/e54093fcc0a651df14040a61fc8efdd338389afa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59364
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/files/patch-qtbase-intel_intrinsics.diff b/aqua/qt55/files/patch-qtbase-intel_intrinsics.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..316c9b1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/tools/qsimd_p.h.orig 2017-09-06 05:13:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qsimd_p.h 2019-10-15 07:35:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,7 +329,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _BitScanForward(&result, val);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ((defined(Q_CC_CLANG) && Q_CC_CLANG < 900) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Clang is missing the intrinsic for _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // GCC only added it in version 4.5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ea7aefe..03ef1ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -801,6 +801,12 @@ foreach {module module_info} [array get modules] {
</span> mkspecs/features/mac/rez.prf
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt assumes _bit_scan_reverse is not provided by Clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this assumption is incorrect for recent versions of Clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/llvm/llvm-project/commit/e54093fcc0a651df14040a61fc8efdd338389afa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59364
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/files/patch-qtbase-intel_intrinsics.diff b/aqua/qt56/files/patch-qtbase-intel_intrinsics.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..914baf9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/tools/qsimd_p.h.orig 2017-09-06 05:13:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qsimd_p.h 2019-10-15 07:35:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -452,7 +452,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _BitScanForward(&result, val);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ((defined(Q_CC_CLANG) && Q_CC_CLANG < 900) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Clang is missing the intrinsic for _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // GCC only added it in version 4.5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ab1ff21..457a27c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -872,6 +872,12 @@ foreach {module module_info} [array get modules] {
</span> mkspecs/features/mac/rez.prf
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt assumes _bit_scan_reverse is not provided by Clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this assumption is incorrect for recent versions of Clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/llvm/llvm-project/commit/e54093fcc0a651df14040a61fc8efdd338389afa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59364
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #-----------------------------------------------------------------------------
# qtbase is used for:
# 1) building qtbase
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/files/patch-qtbase-intel_intrinsics.diff b/aqua/qt57/files/patch-qtbase-intel_intrinsics.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e662912
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/files/patch-qtbase-intel_intrinsics.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/tools/qsimd_p.h.orig 2016-12-01 01:17:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qsimd_p.h 2019-10-17 08:18:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -465,7 +465,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define qCpuHasFeature(feature) ((qCompilerCpuFeatures & (Q_UINT64_C(1) << CpuFeature ## feature)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || (qCpuFeatures() & (Q_UINT64_C(1) << CpuFeature ## feature)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if QT_HAS_BUILTIN(__builtin_clz) && QT_HAS_BUILTIN(__builtin_ctz) && defined(Q_CC_CLANG) && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if QT_HAS_BUILTIN(__builtin_clz) && QT_HAS_BUILTIN(__builtin_ctz) && (defined(Q_CC_CLANG) && Q_CC_CLANG < 900) && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static Q_ALWAYS_INLINE unsigned _bit_scan_reverse(unsigned val)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_ASSERT(val != 0); // if val==0, the result is undefined.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -503,7 +503,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _BitScanForward(&result, val);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif (defined(Q_CC_CLANG) || (defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif ((defined(Q_CC_CLANG) && Q_CC_CLANG < 900) || (!defined(Q_CC_CLANG) && defined(Q_CC_GNU) && Q_CC_GNU < 405)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !defined(Q_CC_INTEL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Clang is missing the intrinsic for _bit_scan_reverse
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // GCC only added it in version 4.5
</span></pre><pre style='margin:0'>
</pre>