summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2013-12-31 15:07:53 -0300
committerLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2013-12-31 15:07:53 -0300
commitc3923e20e84109128cbd5310a78fa241a2459d0e (patch)
tree30078a79843b49a37ab064cb7c3f83b8f0037394
parent12a45e282dcc963d369f751cc17438f0b664245f (diff)
downloadqtbase-c3923e20e84109128cbd5310a78fa241a2459d0e.tar.gz
Enable sparc processor detection.
Also fix typo in previous changelog entry.
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/do_not_pass_wcast-align_on_sparc.patch13
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 568988c..8d4b625 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ qtbase-opensource-src (5.2.0+dfsg-4) UNRELEASED; urgency=medium
* Remove unused piece of code in debian/rules.
[ Lisandro Damián Nicanor Pérez Meyer ]
- * Enable proecessor detection for s390[x].
+ * Enable processor detection for s390[x] and sparc.
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 26 Dec 2013 21:21:17 +0400
diff --git a/debian/patches/do_not_pass_wcast-align_on_sparc.patch b/debian/patches/do_not_pass_wcast-align_on_sparc.patch
new file mode 100644
index 0000000..1938148
--- /dev/null
+++ b/debian/patches/do_not_pass_wcast-align_on_sparc.patch
@@ -0,0 +1,13 @@
+diff --git a/mkspecs/features/qt_headersclean.prf b/mkspecs/features/qt_headersclean.prf
+index ab0a722..1e420b0 100644
+--- a/mkspecs/features/qt_headersclean.prf
++++ b/mkspecs/features/qt_headersclean.prf
+@@ -18,7 +18,7 @@
+ # Enable pedantic mode, but accept variadic macros and 'long long' usage.
+ *-g++*: QMAKE_CXXFLAGS += -Wno-long-long -Wno-variadic-macros -pedantic-errors
+
+-contains(QT_ARCH,arm)|contains(QT_ARCH,mips) {
++contains(QT_ARCH,arm)|contains(QT_ARCH,mips)|contains(QT_ARCH,sparc) {
+ # There are outstanding alignment issues in some container classes.
+ *-g++*:QMAKE_CXXFLAGS -= -Wcast-align
+ }