kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/x11/qt3-libs/patches/patch-ad

44 lines
1.2 KiB
Text
Raw Normal View History

Fix build failure on NetBSD/arm. patch-ad: src/tools/qglobal.h mentionss about Q_NO_PACKED_REFERENCE: --- /* ARM gcc pads structs to 32 bits, even when they contain a single char, or short. We tell gcc to pack QChars to 16 bits, to avoid QString bloat. However, gcc 3.4 doesn't allow us to create references to members of a packed struct. (Pointers are OK, because then you supposedly know what you are doing.) */ # if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) # define Q_PACKED __attribute__ ((packed)) # if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 # define Q_NO_PACKED_REFERENCE --- but it seems we also have to define it on gcc4. patch-ch: Furthermore, it looks gcc4 also rejects implicit pointer casts, so add an explicit cast where the above Q_NO_PACKED_REFERENCE is referred.
2010-08-09 15:21:07 +02:00
$NetBSD: patch-ad,v 1.9 2010/08/09 13:21:07 tsutsui Exp $
Add Interix 3.5 support. (Will be contributed back to Trolltech as well.)
2004-10-13 04:08:43 +02:00
Fix build failure on NetBSD/arm. patch-ad: src/tools/qglobal.h mentionss about Q_NO_PACKED_REFERENCE: --- /* ARM gcc pads structs to 32 bits, even when they contain a single char, or short. We tell gcc to pack QChars to 16 bits, to avoid QString bloat. However, gcc 3.4 doesn't allow us to create references to members of a packed struct. (Pointers are OK, because then you supposedly know what you are doing.) */ # if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) # define Q_PACKED __attribute__ ((packed)) # if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 # define Q_NO_PACKED_REFERENCE --- but it seems we also have to define it on gcc4. patch-ch: Furthermore, it looks gcc4 also rejects implicit pointer casts, so add an explicit cast where the above Q_NO_PACKED_REFERENCE is referred.
2010-08-09 15:21:07 +02:00
--- src/tools/qglobal.h.orig 2007-02-02 14:01:04.000000000 +0000
+++ src/tools/qglobal.h
Add Interix 3.5 support. (Will be contributed back to Trolltech as well.)
2004-10-13 04:08:43 +02:00
@@ -63,6 +63,7 @@
NETBSD - NetBSD
OPENBSD - OpenBSD
BSDI - BSD/OS
+ INTERIX - Interix
IRIX - SGI Irix
OSF - HP Tru64 UNIX
SCO - SCO OpenServer 5
qt3 build system makes a difference between MacOS X and Darwin: it will build with X11 support on Darwin and MacOS X native interface on MacOS X. But the Free qt3 only includes X11 support, and so the build fails on MacOS X. Change the build defines to use the same options on MacOS X and Darwin.
2005-04-13 23:58:05 +02:00
@@ -82,9 +83,9 @@
#if defined(__DARWIN_X11__)
# define Q_OS_DARWIN
#elif defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__))
-# define Q_OS_MACX
+# define Q_OS_DARWIN
#elif defined(__MACOSX__)
-# define Q_OS_MACX
+# define Q_OS_DARWIN
#elif defined(macintosh)
# define Q_OS_MAC9
#elif defined(__CYGWIN__)
Fix build failure on NetBSD/arm. patch-ad: src/tools/qglobal.h mentionss about Q_NO_PACKED_REFERENCE: --- /* ARM gcc pads structs to 32 bits, even when they contain a single char, or short. We tell gcc to pack QChars to 16 bits, to avoid QString bloat. However, gcc 3.4 doesn't allow us to create references to members of a packed struct. (Pointers are OK, because then you supposedly know what you are doing.) */ # if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) # define Q_PACKED __attribute__ ((packed)) # if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 # define Q_NO_PACKED_REFERENCE --- but it seems we also have to define it on gcc4. patch-ch: Furthermore, it looks gcc4 also rejects implicit pointer casts, so add an explicit cast where the above Q_NO_PACKED_REFERENCE is referred.
2010-08-09 15:21:07 +02:00
@@ -120,6 +121,9 @@
Add Interix 3.5 support. (Will be contributed back to Trolltech as well.)
2004-10-13 04:08:43 +02:00
#elif defined(__NetBSD__)
# define Q_OS_NETBSD
Fix build failure on NetBSD/arm. patch-ad: src/tools/qglobal.h mentionss about Q_NO_PACKED_REFERENCE: --- /* ARM gcc pads structs to 32 bits, even when they contain a single char, or short. We tell gcc to pack QChars to 16 bits, to avoid QString bloat. However, gcc 3.4 doesn't allow us to create references to members of a packed struct. (Pointers are OK, because then you supposedly know what you are doing.) */ # if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) # define Q_PACKED __attribute__ ((packed)) # if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 # define Q_NO_PACKED_REFERENCE --- but it seems we also have to define it on gcc4. patch-ch: Furthermore, it looks gcc4 also rejects implicit pointer casts, so add an explicit cast where the above Q_NO_PACKED_REFERENCE is referred.
2010-08-09 15:21:07 +02:00
# define Q_OS_BSD4
Add Interix 3.5 support. (Will be contributed back to Trolltech as well.)
2004-10-13 04:08:43 +02:00
+#elif defined(__INTERIX)
+# define Q_OS_INTERIX
Fix build failure on NetBSD/arm. patch-ad: src/tools/qglobal.h mentionss about Q_NO_PACKED_REFERENCE: --- /* ARM gcc pads structs to 32 bits, even when they contain a single char, or short. We tell gcc to pack QChars to 16 bits, to avoid QString bloat. However, gcc 3.4 doesn't allow us to create references to members of a packed struct. (Pointers are OK, because then you supposedly know what you are doing.) */ # if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) # define Q_PACKED __attribute__ ((packed)) # if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 # define Q_NO_PACKED_REFERENCE --- but it seems we also have to define it on gcc4. patch-ch: Furthermore, it looks gcc4 also rejects implicit pointer casts, so add an explicit cast where the above Q_NO_PACKED_REFERENCE is referred.
2010-08-09 15:21:07 +02:00
+# define Q_OS_BSD4
Add Interix 3.5 support. (Will be contributed back to Trolltech as well.)
2004-10-13 04:08:43 +02:00
#elif defined(__OpenBSD__)
# define Q_OS_OPENBSD
Fix build failure on NetBSD/arm. patch-ad: src/tools/qglobal.h mentionss about Q_NO_PACKED_REFERENCE: --- /* ARM gcc pads structs to 32 bits, even when they contain a single char, or short. We tell gcc to pack QChars to 16 bits, to avoid QString bloat. However, gcc 3.4 doesn't allow us to create references to members of a packed struct. (Pointers are OK, because then you supposedly know what you are doing.) */ # if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) # define Q_PACKED __attribute__ ((packed)) # if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 # define Q_NO_PACKED_REFERENCE --- but it seems we also have to define it on gcc4. patch-ch: Furthermore, it looks gcc4 also rejects implicit pointer casts, so add an explicit cast where the above Q_NO_PACKED_REFERENCE is referred.
2010-08-09 15:21:07 +02:00
# define Q_OS_BSD4
@@ -317,7 +321,7 @@
supposedly know what you are doing.) */
# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
# define Q_PACKED __attribute__ ((packed))
-# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4
+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4
# define Q_NO_PACKED_REFERENCE
# endif
# endif
Reference in a new issue Copy permalink