Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/qt5-qtbase qt5-qtbase: fix build on SunOS



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fe3942db562b
branches:  trunk
changeset: 430693:fe3942db562b
user:      wiedi <wiedi%pkgsrc.org@localhost>
date:      Sun May 03 11:41:45 2020 +0000

description:
qt5-qtbase: fix build on SunOS

diffstat:

 x11/qt5-qtbase/Makefile.common                              |   5 +++-
 x11/qt5-qtbase/distinfo                                     |   3 +-
 x11/qt5-qtbase/patches/patch-src_corelib_global_qrandom.cpp |  15 +++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diffs (55 lines):

diff -r 3c19dd4bdfee -r fe3942db562b x11/qt5-qtbase/Makefile.common
--- a/x11/qt5-qtbase/Makefile.common    Sun May 03 11:33:21 2020 +0000
+++ b/x11/qt5-qtbase/Makefile.common    Sun May 03 11:41:45 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.43 2020/04/17 02:00:52 gutteridge Exp $
+# $NetBSD: Makefile.common,v 1.44 2020/05/03 11:41:45 wiedi Exp $
 # used by x11/qt5-mysql/Makefile
 # used by x11/qt5-odbc/Makefile
 # used by x11/qt5-psql/Makefile
@@ -47,6 +47,9 @@
 # wcstof(3) etc. is used in C++ code.
 CFLAGS.NetBSD+=                -D_NETBSD_SOURCE
 
+# include/openssl/e_os2.h:283:25: error: '_Noreturn' does not name a type
+CXXFLAGS.SunOS+=       -D_Noreturn=""
+
 # for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined.
 BUILDLINK_TRANSFORM+=  rm:-Wundef
 
diff -r 3c19dd4bdfee -r fe3942db562b x11/qt5-qtbase/distinfo
--- a/x11/qt5-qtbase/distinfo   Sun May 03 11:33:21 2020 +0000
+++ b/x11/qt5-qtbase/distinfo   Sun May 03 11:41:45 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2020/04/02 22:05:57 adam Exp $
+$NetBSD: distinfo,v 1.59 2020/05/03 11:41:45 wiedi Exp $
 
 SHA1 (qtbase-everywhere-src-5.14.2.tar.xz) = 9de814d3b9005bf984a78e4b564fbb9413e043c4
 RMD160 (qtbase-everywhere-src-5.14.2.tar.xz) = 103d9c42037393a8c3e6467c9bd1eab447d3c4fb
@@ -12,6 +12,7 @@
 SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 915223f7a5b71543f4bb86c0b021284971be5786
 SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = e050b334cecc56259bd1755cd2de8c5bbf1409c0
 SHA1 (patch-src_corelib_configure.json) = 7a83a356330e602cbc65256dd345a107004a67cb
+SHA1 (patch-src_corelib_global_qrandom.cpp) = d910579df42d5b01583b88fa19f514b230596ca7
 SHA1 (patch-src_corelib_io_io.pri) = b2c1057e20c3150162695947bab958a2644df7dc
 SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = b12a41da19b25e34e12fdf80714a37e8c46278f9
 SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 9919194e9f6b47f1f311b8f8223a6a7519152073
diff -r 3c19dd4bdfee -r fe3942db562b x11/qt5-qtbase/patches/patch-src_corelib_global_qrandom.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qtbase/patches/patch-src_corelib_global_qrandom.cpp       Sun May 03 11:41:45 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_corelib_global_qrandom.cpp,v 1.1 2020/05/03 11:41:45 wiedi Exp $
+
+No getauxval on SunOS
+
+--- src/corelib/global/qrandom.cpp.orig        2020-03-27 09:49:31.000000000 +0000
++++ src/corelib/global/qrandom.cpp
+@@ -277,7 +277,7 @@ static void fallback_fill(quint32 *ptr,
+     if (quint32 v = seed.loadRelaxed())
+         *end++ = v; // 6
+ 
+-#if QT_CONFIG(getauxval)
++#if QT_CONFIG(getauxval) && !defined(Q_OS_SOLARIS)
+     // works on Linux -- all modern libc have getauxval
+ #  ifdef AT_RANDOM
+     // ELF's auxv AT_RANDOM has 16 random bytes



Home | Main Index | Thread Index | Old Index