Mir

Merge lp:~sil2100/mir/ubuntu_arm64 into lp:mir/ubuntu

  1. ubuntu_arm64
  2. Merge into ubuntu
Proposed by Łukasz Zemczak
Status: Work in progress
Proposed branch: lp:~sil2100/mir/ubuntu_arm64
Merge into: lp:mir/ubuntu
Diff against target: 72 lines (+8/-8)
2 files modified
debian/control (+7/-7)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~sil2100/mir/ubuntu_arm64
Reviewer Review Type Date Requested Status
Mir development team Pending
Review via email: mp+300338@code.launchpad.net

Commit message

Test-build mir to see if we can enable arm64 easily.

Description of the change

Test-build mir to see if we can enable arm64 easily. Warning! Not for actual landing!

To post a comment you must log in.
lp:~sil2100/mir/ubuntu_arm64 updated
1286. By Łukasz Zemczak

Cherry-pick Daniel's rules change

Unmerged revisions

1286. By Łukasz Zemczak

Cherry-pick Daniel's rules change

1285. By Łukasz Zemczak

Test-build mir to see if we can enable arm64 easily.

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 2016-04-29 17:25:33 +0000
3+++ debian/control 2016-07-19 10:07:25 +0000
4@@ -24,8 +24,8 @@
5 libprotobuf-dev,
6 pkg-config,
7 android-headers-23,
8- libhardware-dev [i386 amd64 armhf],
9- libandroid-properties-dev [i386 amd64 armhf],
10+ libhardware-dev [i386 amd64 armhf arm64],
11+ libandroid-properties-dev [i386 amd64 armhf arm64],
12 libgoogle-glog-dev,
13 liblttng-ust-dev,
14 libxkbcommon-dev,
15@@ -35,7 +35,7 @@
16 libgtest-dev,
17 google-mock (>= 1.6.0+svn437),
18 # only enable valgrind once it's been tested to work on each architecture:
19- valgrind [amd64 i386 armhf],
20+ valgrind [amd64 i386 armhf arm64],
21 libglib2.0-dev,
22 libfreetype6-dev,
23 abi-compliance-checker,
24@@ -276,7 +276,7 @@
25 Contains a tool for stress testing the Mir display server
26
27 Package: mir-android-diagnostics
28-Architecture: i386 amd64 armhf
29+Architecture: i386 amd64 armhf arm64
30 Pre-Depends: ${misc:Pre-Depends}
31 Depends: ${misc:Depends},
32 ${shlibs:Depends},
33@@ -331,7 +331,7 @@
34
35 Package: mir-platform-graphics-android9
36 Section: libs
37-Architecture: i386 amd64 armhf
38+Architecture: i386 amd64 armhf arm64
39 Multi-Arch: same
40 Pre-Depends: ${misc:Pre-Depends}
41 Depends: ${misc:Depends},
42@@ -387,7 +387,7 @@
43
44 Package: mir-client-platform-android5
45 Section: libs
46-Architecture: i386 amd64 armhf
47+Architecture: i386 amd64 armhf arm64
48 Multi-Arch: same
49 Pre-Depends: ${misc:Pre-Depends}
50 Depends: ${misc:Depends},
51@@ -418,7 +418,7 @@
52
53 Package: mir-graphics-drivers-android
54 Section: libs
55-Architecture: i386 amd64 armhf
56+Architecture: i386 amd64 armhf arm64
57 Multi-Arch: same
58 Pre-Depends: ${misc:Pre-Depends}
59 Depends: ${misc:Depends},
60
61=== modified file 'debian/rules'
62--- debian/rules 2016-03-23 06:39:56 +0000
63+++ debian/rules 2016-07-19 10:07:25 +0000
64@@ -29,7 +29,7 @@
65 endif
66
67 override_dh_auto_configure:
68-ifeq ($(DEB_HOST_ARCH),armhf)
69+ifneq ($(filter armhf arm64,$(DEB_HOST_ARCH)),)
70 dh_auto_configure -- \
71 $(COMMON_CONFIGURE_OPTIONS) \
72 -DMIR_RUN_ACCEPTANCE_TESTS=OFF \

Subscribers

People subscribed via source and target branches