diff options
| author | wiz <wiz@pkgsrc.org> | 2014-08-10 17:36:09 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-08-10 17:36:09 +0000 |
| commit | 2ace400b140d7a24a37f8ef6fa6a85f4a25a3a39 (patch) | |
| tree | 61dbb197edd0af249f6b19eab305d23baf671099 /x11/qt4-libs | |
| parent | b6854c0a8a6014855a9726c0a1cf6cadfa63de3b (diff) | |
| download | pkgsrc-2ace400b140d7a24a37f8ef6fa6a85f4a25a3a39.tar.gz | |
Add a patch in the hope it fixes the build with clang.
Still builds with gcc.
Diffstat (limited to 'x11/qt4-libs')
| -rw-r--r-- | x11/qt4-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index d40d2579f16..2b6fc74698f 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.90 2014/07/22 17:01:51 wiz Exp $ +$NetBSD: distinfo,v 1.91 2014/08/10 17:36:09 wiz Exp $ SHA1 (qt-everywhere-opensource-src-4.8.6.tar.gz) = ddf9c20ca8309a116e0466c42984238009525da6 RMD160 (qt-everywhere-opensource-src-4.8.6.tar.gz) = 0220d4e76ac761c9ecfb8ddab6f2c1dc6ad70c33 @@ -44,6 +44,7 @@ SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Collector.cpp) = SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.cpp) = 156e99fa8594470be4e89e212408258824044e41 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.h) = b822a84aae7e125cb56b01bffdcfec07060d88f6 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_RefCountedLeakCounter.h) = 3b70ecb3a95944a3dd4a26c7b5c53e44aa89de1a +SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h) = 375e5ed9af891b3511a4d5fe940e4080d5ff95c2 SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h) = f23437f6e4b47f999d4fc2c576c5e7a63446b9da SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp) = c7c9c39b11007e7ec3884874a38d000e3238bf64 diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h new file mode 100644 index 00000000000..c483683dca2 --- /dev/null +++ b/x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h @@ -0,0 +1,17 @@ +$NetBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h,v 1.3 2014/08/10 17:36:09 wiz Exp $ + +Fix build with clang. + +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h.orig 2014-04-10 18:37:12.000000000 +0000 ++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +@@ -78,7 +78,9 @@ + #elif OS(QNX) + #include <atomic.h> + #elif COMPILER(GCC) && !OS(SYMBIAN) +-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) ++#include <ciso646> ++#ifdef _LIBCPP_VERSION ++#elif (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) + #include <ext/atomicity.h> + #else + #include <bits/atomicity.h> |