unity-js-scopes

Merge lp:~fboucault/unity-js-scopes/crossbuild_fixes into lp:unity-js-scopes

  1. crossbuild_fixes
  2. Merge into trunk
Proposed by Florian Boucault
Status: Needs review
Proposed branch: lp:~fboucault/unity-js-scopes/crossbuild_fixes
Merge into: lp:unity-js-scopes
Diff against target: 30 lines (+5/-3)
2 files modified
debian/control (+2/-3)
debian/rules (+3/-0)
To merge this branch: bzr merge lp:~fboucault/unity-js-scopes/crossbuild_fixes
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve
WebApps Pending
Review via email: mp+300523@code.launchpad.net

Commit message

Crossbuilding fixes.

Description of the change

Crossbuilding fixes.

To post a comment you must log in.
Revision history for this message
David Barth (dbarth) wrote :

I think you need to keep the g++ build-dep, as the launcher is built on top of nodejs which is pulled and compiled during the build process.

Reply
Revision history for this message
Florian Boucault (fboucault) wrote :

I think it is pulled anyway

Le mer. 20 juil. 2016 10:11, David Barth <email address hidden> a
écrit :

> I think you need to keep the g++ build-dep, as the launcher is built on
> top of nodejs which is pulled and compiled during the build process.
> --
>
> https://code.launchpad.net/~fboucault/unity-js-scopes/crossbuild_fixes/+merge/300523
> You are the owner of lp:~fboucault/unity-js-scopes/crossbuild_fixes.
>

Reply
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:143
https://jenkins.canonical.com/unity-api-1/job/lp-unity-js-scopes-ci/13/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/226
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/234
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/176
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/176
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/176
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/105
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/105/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/105
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/105/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/105
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/105/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/105
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/105/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/105
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/105/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/105
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/105/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/105
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/105/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/105
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/105/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/105
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/105/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-js-scopes-ci/13/rebuild

review: Approve (continuous-integration)
Reply

Unmerged revisions

143. By Florian Boucault

Crossbuilding fixes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2015-11-09 15:08:51 +0000
+++ debian/control 2016-07-19 20:32:37 +0000
@@ -5,10 +5,9 @@
5Build-Depends: bzr,5Build-Depends: bzr,
6 cmake (>= 2.8.9),6 cmake (>= 2.8.9),
7 debhelper (>= 9),7 debhelper (>= 9),
8 g++,
9 pkg-config,8 pkg-config,
10 python3,9 python3:any,
11 python3-scope-harness,10 python3-scope-harness <!cross>,
12 libboost-filesystem-dev,11 libboost-filesystem-dev,
13 libunity-scopes-dev,12 libunity-scopes-dev,
14Standards-Version: 3.9.513Standards-Version: 3.9.5
1514
=== modified file 'debian/rules'
--- debian/rules 2015-07-09 01:02:19 +0000
+++ debian/rules 2016-07-19 20:32:37 +0000
@@ -3,6 +3,9 @@
33
4export DEB_BUILD_HARDENING=14export DEB_BUILD_HARDENING=1
5export DPKG_GENSYMBOLS_CHECK_LEVEL=45export DPKG_GENSYMBOLS_CHECK_LEVEL=4
6ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
7export DEB_BUILD_PROFILES := cross
8endif
69
7%:10%:
8 dh $@ --parallel11 dh $@ --parallel

Subscribers

People subscribed via source and target branches

to all changes: