platform-api

Merge lp:~fboucault/platform-api/crossbuild_fixes into lp:platform-api

Proposed by Florian Boucault on 2016-07-06

Status:	Needs review
Proposed branch:	lp:~fboucault/platform-api/crossbuild_fixes
Merge into:	lp:platform-api
Diff against target:	20 lines (+2/-4) 1 file modified debian/rules (+2/-4)
To merge this branch:	bzr merge lp:~fboucault/platform-api/crossbuild_fixes
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Pending
Ubuntu Phablet Team		2016-07-06	Pending
Review via email: mp+299278@code.launchpad.net

Fixes for crossbuilding.

Fixes for crossbuilding.

316. By Florian Boucault on 2016-07-06: do not execute tests when cross compiling
317. By Florian Boucault on 2016-07-14: Merged with trunk
318. By Florian Boucault on 2016-07-14: reverted spurious changes

318. By Florian Boucault on 2016-07-14: reverted spurious changes
317. By Florian Boucault on 2016-07-14: Merged with trunk
316. By Florian Boucault on 2016-07-06: do not execute tests when cross compiling
315. By Florian Boucault on 2016-07-06: Fixes for crossbuilding.
314. By CI Train Bot Account on 2015-11-26: Releasing 3.0.0+15.04.20151126-0ubuntu1
313. By Thomas Voß on 2015-11-26: Force rebuild against dbus-cpp.
Approved by: Łukasz Zemczak

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'debian/rules'
2	--- debian/rules 2015-07-15 19:23:50 +0000
3	+++ debian/rules 2016-07-14 14:02:00 +0000
4	@@ -7,14 +7,12 @@
5	%:
6	dh $@
7
8	-override_dh_auto_configure:
9	- dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
10	-
11	override_dh_install:
12	dh_install --fail-missing
13
14	override_dh_auto_test:
15	+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
16	ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))
17	cd obj-* && ctest --verbose
18	endif
19	-
20	+endif