Merge lp:~timo-jyrinki/libcolumbus/workaround_lp_1187771 into lp:libcolumbus

[Timo Jyrinki]

Use -DCMAKE_BUILD_TYPE='' in debian/rules (LP: #1187771)

This workaround fixes the issue for now.

Use -DCMAKE_BUILD_TYPE='' in debian/rules (LP: #1187771)

This workaround fixes the issue for now.

[Mathieu Trudel-Lapierre (cyphermox)]

I think it would be more correct to just drop that ifdef altogether; there's no point in keeping it if the symbol is to be undefined just before anyway.

review: Needs Fixing

[Timo Jyrinki (timo-jyrinki)]

I'll let Jussi decide, since he should know the history behind that ifdef. The tests run just fine locally if it's not defined.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:450
http://jenkins.qa.ubuntu.com/job/libcolumbus-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-saucy-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-saucy-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libcolumbus-ci/5/rebuild

review: Approve (continuous-integration)

[Jussi Pakkanen (jpakkane)]

Don't undefine it! All tests use assert. If NDEBUG is defined all asserts become no-ops. This gives you a test suite that runs but does not check for anything.

review: Disapprove

[Timo Jyrinki (timo-jyrinki)]

Thanks. I'll suspect a better fix for the build failure comes soon? :) Currently NDEBUG seems to be defined by default, it's not set anywhere.

test/LevTrieTest.cc is btw the only place which checks the use of NDEBUG.

[Jussi Pakkanen (jpakkane)]

That file is the only place that checks for it because one warning is all that we need. As evidenced here.

I have no idea where the NDEBUG comes from. Quick observation shows that build flags come from two different sources because optimization is defined twice:

[snip] /usr/bin/c++ [snip] -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -Wall -pedantic -Wextra -fvisibility=hidden -std=c++11 -O2 -g -DNDEBUG -fPIC

The first bunch comes from dpkg-buildflags. The latter from somewhere. I have no idea where. The only option I can think of is that they come from -DCMAKE_BUILD_TYPE=relwithdebinfo, but according to the log, that flag is not given to CMake. Has dh_auto_configure been changed to pass that in?

[Jussi Pakkanen (jpakkane)]

Instead of the current merge, could you try changing in debian/rules this:

override_dh_auto_configure:
 dh_auto_configure -- -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)

into this:

override_dh_auto_configure:
 dh_auto_configure -- -DCMAKE_BUILD_TYPE='' -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)

[lp:~timo-jyrinki/libcolumbus/workaround_lp_1187771]

451. By Timo Jyrinki on 2013-06-05

Revert previous commit

452. By Timo Jyrinki on 2013-06-05

Use -DCMAKE_BUILD_TYPE='' mentioned by Jussi as the workaround (instead)

[Timo Jyrinki (timo-jyrinki)]

Thanks Jussi! That seems to work as well. Committed.

[Jussi Pakkanen (jpakkane)]

Good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:452
http://jenkins.qa.ubuntu.com/job/libcolumbus-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-saucy-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libcolumbus-saucy-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libcolumbus-ci/6/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/rules'
--- debian/rules	2013-01-18 08:33:23 +0000
+++ debian/rules	2013-06-05 14:34:24 +0000
@@ -16,7 +16,7 @@
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	dh_auto_configure -- -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) -DCMAKE_BUILD_TYPE=''
 
 override_dh_install:
 	dh_install --fail-missing