diff options
| author | richard <richard@pkgsrc.org> | 2016-08-30 07:58:27 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2016-08-30 07:58:27 +0000 |
| commit | f301bb33600401e591458aef4cabaa1a19e1b5ac (patch) | |
| tree | ff5822a4ca65704269bd34b8c87fdecd8b5fcd77 | |
| parent | 4b7f76003ab6824c210eb579bf16352ccc18597e (diff) | |
| download | pkgsrc-f301bb33600401e591458aef4cabaa1a19e1b5ac.tar.gz | |
deal with aarch64 in webkit wtf for qt4-libs
| -rw-r--r-- | x11/qt4-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt4-libs/options.mk | 4 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h | 25 |
3 files changed, 29 insertions, 3 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index a4eb4f5c877..1dce4134bac 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.109 2016/05/31 21:35:11 joerg Exp $ +$NetBSD: distinfo,v 1.110 2016/08/30 07:58:27 richard Exp $ SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666 RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166 @@ -57,6 +57,7 @@ SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h) = c79d9ed7f SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_HashSet.h) = 25654a9f2cedb17b5f536b324e47d56eb4010029 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 68152f0077ec5bcce1b3774aaac64af5fd9e491e SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h) = 3c1dbd49e236669fe9849918e571eed58980421b +SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h) = 8f398aebc6d1b380c271489248efd92a35c7e23d SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_RefCountedLeakCounter.h) = fc4686c018471fcae375d9382737e0844a0f45a8 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h) = d5460bede6b3662df4d9dbec5826db98c6ef4f61 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h) = 2d3176beb56697d033387ab10729cfb6681d01c7 diff --git a/x11/qt4-libs/options.mk b/x11/qt4-libs/options.mk index 49ad5710fb1..529142c0c75 100644 --- a/x11/qt4-libs/options.mk +++ b/x11/qt4-libs/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2014/06/18 09:26:12 wiz Exp $ +# $NetBSD: options.mk,v 1.7 2016/08/30 07:58:27 richard Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qt4 PKG_SUPPORTED_OPTIONS= cups debug gtk2 @@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= cups debug gtk2 .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mcups) -. include "../../print/cups15/buildlink3.mk" +. include "../../print/cups/buildlink3.mk" CONFIGURE_ARGS+= -cups .else CONFIGURE_ARGS+= -no-cups diff --git a/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h new file mode 100644 index 00000000000..06a50d004b1 --- /dev/null +++ b/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h @@ -0,0 +1,25 @@ +$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Platform.h,v 1.1 2016/08/30 07:58:27 richard Exp $ +deal with aarch64 +--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig 2015-05-07 14:14:45.000000000 +0000 ++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h +@@ -373,6 +373,10 @@ + #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 + #endif + ++/* CPU(AARCH64) */ ++#if defined(__aarch64__) ++#define WTF_CPU_AARCH64 1 ++#endif + /* ==== OS() - underlying operating system; only to be used for mandated low-level services like + virtual memory, not to choose a GUI toolkit ==== */ + +@@ -1003,7 +1007,8 @@ + || CPU(SPARC64) \ + || CPU(S390X) \ + || CPU(PPC64) \ +- || CPU(MIPS64) ++ || CPU(MIPS64) \ ++ || CPU(AARCH64) + #define WTF_USE_JSVALUE64 1 + #else + #define WTF_USE_JSVALUE32_64 1 |