Merge lp:~xnox/xpathselect/cross-compile into lp:xpathselect

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Thomi Richards
Approved revision: 40
Merged at revision: 40
Proposed branch: lp:~xnox/xpathselect/cross-compile
Merge into: lp:xpathselect
Diff against target: 37 lines (+5/-2)
2 files modified
debian/control (+0/-1)
debian/rules (+5/-1)
To merge this branch: bzr merge lp:~xnox/xpathselect/cross-compile
Reviewer Review Type Date Requested Status
Thomi Richards (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+198834@code.launchpad.net

Commit message

Fix cross-compilation:
 - do not execute tests
 - do not depend on wrong architecture compiler
 - remove empty debian/docs

Description of the change

Fix cross-compilation:
 - do not execute tests
 - do not depend on wrong architecture compiler
 - remove empty debian/docs

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-08-14 23:11:53 +0000
3+++ debian/control 2013-12-12 21:41:15 +0000
4@@ -5,7 +5,6 @@
5 Build-Depends: debhelper (>= 9),
6 cmake,
7 libboost-dev,
8- g++ (>= 4.7.0),
9 libgtest-dev,
10 Standards-Version: 3.9.3
11 Section: libs
12
13=== removed file 'debian/docs'
14=== modified file 'debian/rules'
15--- debian/rules 2012-11-27 16:54:03 +0000
16+++ debian/rules 2013-12-12 21:41:15 +0000
17@@ -3,6 +3,8 @@
18 # export DH_VERBOSE=1
19 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
20
21+include /usr/share/dpkg/default.mk
22+
23 %:
24 dh $@
25
26@@ -11,8 +13,10 @@
27 find debian/tmp -name \*.a -delete
28 dh_install --fail-missing
29
30+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
31 override_dh_auto_test:
32- obj-*/test/test-runner
33+ obj-*/test/test-runner
34+endif
35
36 override_dh_makeshlibs:
37 dh_makeshlibs -V

Subscribers

People subscribed via source and target branches