Merge lp:~hjd/widelands/asan-off-deb-package into lp:widelands

Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 8508
Proposed branch: lp:~hjd/widelands/asan-off-deb-package
Merge into: lp:widelands
Diff against target: 23 lines (+2/-0)
2 files modified
debian/changelog (+1/-0)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~hjd/widelands/asan-off-deb-package
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+334321@code.launchpad.net

Description of the change

Disable ASAN when building the Debian package.

Started a test run in my PPA, let's see how this works https://code.launchpad.net/~hjd/+recipe/widelands-test

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

All green, thanks!

@bunnybot merge

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 2870. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/308029234.
Appveyor build 2679. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_hjd_widelands_asan_off_deb_package-2679.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-08-29 16:03:34 +0000
3+++ debian/changelog 2017-11-27 17:46:22 +0000
4@@ -8,6 +8,7 @@
5 - Also dropped version-specific glew alternative.
6 1.6 doesn't seem to be around anymore and the versionless one
7 seems to work across the different distro releases we build for
8+ * Build with ASAN disabled since parts of the code atm breaks
9 * Merged Debian packaging of Widelands 1:19+repack-4. Remaining changes:
10 - Revert debhelper/compat level to 9. (Ubuntu 14.04 doesn't have debhelper 10.)
11 - Disabled all Debian-patches since applying them might cause conflicts as
12
13=== modified file 'debian/rules'
14--- debian/rules 2017-08-26 09:24:28 +0000
15+++ debian/rules 2017-11-27 17:46:22 +0000
16@@ -18,6 +18,7 @@
17 -DWL_INSTALL_DATADIR=/usr/share/games/widelands/data \
18 -DWL_INSTALL_PREFIX=/usr \
19 -DOPTION_USE_GLBINDING:BOOL=OFF \
20+ -DOPTION_ASAN=OFF \
21 -DCMAKE_BUILD_TYPE=Release
22
23 override_dh_auto_install:

Subscribers

People subscribed via source and target branches

to status/vote changes: