On 26/08/15 17:36, Robert Edmonds wrote:
> This sounds very vaguely similar to #572923, for which the workaround
> was to disable optimization of a single function
If you can find the right single function, please do :-) Both minkus
(mips porterbox) and eder (mipsel porterbox) can be used to reproduce
this. I would recommend minkus as the one to try first, it's
significantly faster.
> I'm OK with a NMU that disables optimization of the entire build on
> mips{,el} for now, though, if it will keep the GCC-5 transition moving
> along. Please feel free to upload to incoming rather than DELAYED.
Thanks, I NMU'd the attached without going via DELAYED. I'm sure it
isn't the most elegant way to disable optimization, but it can be
superseded by a better maintainer-upload once the dust has settled.
I'll reduce this bug to non-RC when the buildds have produced a complete
set of builds, which will hopefully happen overnight.
S
diffstat for protobuf-2.6.1 protobuf-2.6.1
changelog | 10 ++++++++++
rules | 6 ++++++
2 files changed, 16 insertions(+)
diff -Nru protobuf-2.6.1/debian/changelog protobuf-2.6.1/debian/changelog
--- protobuf-2.6.1/debian/changelog 2015-08-06 07:48:15.000000000 +0100
+++ protobuf-2.6.1/debian/changelog 2015-08-26 21:38:00.000000000 +0100
@@ -1,3 +1,13 @@
+protobuf (2.6.1-1.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Disable optimization on mips and mipsel so that the tests pass.
+ To keep the g++-5 transition moving, optimization is completely
+ disabled here; someone who knows better can be more selective
+ later. (Mitigates: #796069)
+
+ -- Simon McVittie <s...@debian.org> Wed, 26 Aug 2015 21:37:58 +0100
+
protobuf (2.6.1-1.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru protobuf-2.6.1/debian/rules protobuf-2.6.1/debian/rules
--- protobuf-2.6.1/debian/rules 2015-07-29 16:26:56.000000000 +0100
+++ protobuf-2.6.1/debian/rules 2015-08-26 21:37:55.000000000 +0100
@@ -1,5 +1,11 @@
#!/usr/bin/make -f
+ifneq (,$(filter mips mipsel,$(shell dpkg-architecture -qDEB_HOST_ARCH)))
+export DEB_CFLAGS_MAINT_APPEND = -O0
+export DEB_CXXFLAGS_MAINT_APPEND = -O0
+endif
+
+
%:
dh $@ --with autoreconf,python2
