Merge lp:~dobey/unity8/fix-cross into lp:unity8

Proposed by dobey on 2014-09-16
Status: Merged
Approved by: Michał Sawicz on 2015-01-07
Approved revision: 1266
Merged at revision: 1533
Proposed branch: lp:~dobey/unity8/fix-cross
Merge into: lp:unity8
Diff against target: 16 lines (+4/-2)
1 file modified
debian/control (+4/-2)
To merge this branch: bzr merge lp:~dobey/unity8/fix-cross
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) 2014-09-16 Abstain on 2015-01-08
PS Jenkins bot (community) continuous-integration Approve on 2015-01-07
Michał Sawicz Approve on 2015-01-07
Review via email: mp+234818@code.launchpad.net

Commit message

Depend on :native version of g++ to allow cross-compiling to work.

To post a comment you must log in.
Albert Astals Cid (aacid) wrote :

Something needs fixing, CI doesn't like this change at all.

review: Needs Fixing
Michał Sawicz (saviq) wrote :

This does, however, fix crossbuilding... I'll talk to CI team to find out what can be done on the other side.

Colin Watson (cjwatson) wrote :

There's no good solution here yet, so some kind of hack is inevitable if you need cross-building working out of the box right now.

This build-dependency change amounts to build-depending on a specific compiler version only for the build architecture. I can certainly see that it would dodge the problem in this case, but it MUST be annotated with the reasoning (because it is counterintuitive) and as something that could break at any time; in particular with this hack you will get whatever version of g++ happens to be in the build chroots when cross-compiling, which may not be g++-4.9.

https://wiki.debian.org/CrossTranslatableBuildDeps has a list of possible solutions identified at a recent Debian sprint. My understanding is that option 7 (with tweaks to add versions, I think) is the current preferred direction. It does however require changes to compiler packaging before you get to use it.

Albert Astals Cid (aacid) wrote :

CI seems to be happy now

review: Abstain
Albert Astals Cid (aacid) wrote :

Text conflict in debian/control
1 conflicts encountered.

review: Needs Fixing
Albert Astals Cid (aacid) wrote :

Would anyone mind if i move this to Work in Progress to clean my dashboard?

Michał Sawicz (saviq) wrote :

Dobey, can you please add a comment as per what Colin wrote above, and let's merge it.

review: Needs Fixing
lp:~dobey/unity8/fix-cross updated on 2014-12-19
1265. By dobey on 2014-12-19

[ Ubuntu daily release ]
* New rebuild forced
[ Albert Astals ]
* Need to wait until loaded is true to use the count property
* Manage Dash: Ellide properly
[ Albert Astals Cid ]
* ScopesList: Use the default scope style for the header
[ Daniel d'Andrada ]
* Refactor Dialogs.qml to use proper in-scene dialogs
* Make Greeter nicely handle being resized
[ Albert Astals ]
* Rework how we set the ranges so we get some more asynchronousity
  from item views (LP: #1384374)
* clickscope is back to being unfavoritable (LP: #1400762)
* Fix clicking on the manage dash list after having moved the current
  scope
* Make the drag range be a multiple of the drag "rate" value.
  Workarounds https://bugs.launchpad.net/mir/+bug/1399690
[ Gerry Boland ]
* MockAppMan: emit SIGSTOP so AP test apps are run (LP: #1394208)
[ Ubuntu daily release ]
* New rebuild forced
[ Albert Astals ]
* Make Navigation work when "jumping" to the non root
[ Michał Sawicz ]
* Bump version due to new Manage Dash
[ Gerry Boland ]
* [indicators] Fix positioning on panel resize.
[ Nick Dedekind ]
* [indicators] Fix positioning on panel resize.
[ Albert Astals ]
* Fix the Dash Header hamburger menu background color
* Fix tests (LP: #1400449)
* Allow pulling manage dash if there's no favorite scopes (LP:
  #1400774)
* Manage Dash: Make store button work even if you have no favorites
  (LP: #1400771)
* Make pot_file
[ CI Train Bot ]
* Resync trunk
[ Andrea Cimitan ]
* Remove dismiss timer in Launcher (LP: #1368778)
[ Michael Zanetti ]
* decrease opacity changes in spread, move it to a separate surface.
* Add an initial, rudimentary DesktopStage to get started
* Uninvert Launcher in Desktop Mode
* Add support for Wallpaper in Desktop stage
* Add window control buttons to panel for fullscreen applications
[ Rodney Dawes ]
* Add dependency on gir1.2-notify-0.7 to unity8-autopilot package.
  (LP: #1400437)
[ CI Train Bot ]
* Resync trunk
[ Albert Astals ]
* Replace Scopes Overview by the new Manage Dash (LP: #1386698,
  #1368670)
[ Michael Terry ]
* Import wizard code from ubuntu-system-settings.
* Convert the welcome wizard from a separate executable into a qml
  plugin (with a small C++ plugin for support).
* Add tests for welcome wizard.
[ Michael Terry ]
* Make sure that there is no window of opportunity for swiping away
  greeter before the lockscreen appears.
* Don't allow dragging the greeter out from the left edge if it's
  hidden there. (LP: #1372952)
[ Michał Sawicz ]
* Move from Theme colour to direct UbuntuColors.orange for activity
  indicator and preview buttons
[ Albert Astals ]
* Use QImageReader not to load the image into memory twice (LP:
  #1384374)
* Don't create the whole current scope delegates, just height * 3 (LP:
  #1384393, #1384374)
* Make CroppedImageSizer async
* Use ubuntu::connectivity::NetworkingStatus instead of
  QNetworkConfigurationManager
* Compile with Qt 5.4 (LP: #1395636)
[ Michael Zanetti ]
* close previews and temp scopes on left edge/BFB (LP: #1391798)
* make spread reversible (LP: #1368668, #1355284, #1368677)
[ Andrea Cimitan ]
* Different drag behaviour for not closable apps in spread (LP:
  #1368287)
[ Daniel d'Andrada ]
* Make UnityTestCase.touchFlick properly map event coordinates
[ Michael Zanetti ]
* improve snapping after dragging
* Make the launcher BFB rounded on one end (LP: #1382596)
* disable swipeToClose while some snapping is happening (LP: #1378938)
* increase threshold and avoid jumping in SpreadDelegate dragging (LP:
  #1352842, #1350803)
[ Ying-Chun Liu ]
* Notifications should be on right side when wide. (LP: 1379384) (LP:
  #1379384)
[ Albert Astals ]
* Fix qml warnings
* Fix some qmluitests
[ Lars Uebernickel ]
* Use Icon instead of StatusIcon
[ josharenson ]
* Return focus to the application after a tusted session overlay is
  closing. (LP: #1381292)
[ Josh Arenson ]
* Return focus to the application after a tusted session overlay is
  closing. (LP: #1381292)
[ Albert Astals ]
* Remove unused ResponsiveFlowView
* Fix a few cmake warnings when running ./build.sh in a clean checkout
[ Mirco Müller ]
* Make sure non-square icons are not cropped. (LP: #1378417)
[ Michael Terry ]
* Drop the "EARLY ALPHA" scare label when running in testing mode.
[ Michael Zanetti ]
* unify Greeter and Lockscreen wallpaper again
* hide quicklist when launcher hides (LP: #1387088)
* Keep applications suspended while lockscreen is shown (LP: #1378126)
* change spread background color to 111111
[ Omer Akram ]
* show password when tapped on the 'Show password' label, not just the
  checkbox. (LP: #1389832)
* No-change rebuild against Qt 5.3.2.
[ Michael Terry ]
* Skip second SIM unlock dialog if user presses Emergency Call on
  first one (LP: #1387925)
[ Michael Zanetti ]
* fix positive/negative answer order on the new swipe notification
  (LP: #1358343)
* Update PageHeader to use new SDK api
* antialias surfaces when in spread (LP: #1351559)
[ Albert Astals ]
* Remove Hud
[ Mirco Müller ]
* Replace ComboButton in snap-decision notifications, used for
  additional actions (> 3 actions), with custom widget immune to
  accidental taps. (LP: #1384730)
[ Sebastien Bacher ]
* Drop workaround, it's not needed and create issues for desktop-next
  (LP: #1387671)
[ Albert Astals ]
* Do not append integer to char *
* Remove unused end() function
* Update build.sh
* Fix i18n
[ Michael Zanetti ]
* rework launcher quicklist visuals to fit new design (LP: #1368660)
* Fix DBusVariant conversion for launcher emblems (LP: #1387261)
* Fix desktop file encoding in launcher (LP: #1387083)
* Add a hinting animation to indicate changes in the backend (LP:
  #1376707)
[ Alberto Aguirre ]
* Add audioRole to QtMultimedia mock
* Add a plugin to take screenshots on vol up + vol down
[ CI bot ]
* Fix relative time formatter when using non-UTC timezone. (LP:
  #1378821)
[ Leo Arias ]
* Removed the tests for the alternate paths of the autopilot helpers.
[ Nick Dedekind ]
* Fix relative time formatter when using non-UTC timezone. (LP:
  #1378821)
* Reset current item selection on deleted. (LP: #1378462)
* Added timer to re-assert server value after indicator menu item
  activation. (LP: #1336715)
[ Mirco Müller ]
* Added dedicated swipe-to-act button for snap-decisions, which avoids
  accidental taps/button-presses. (LP: #1358343)
[ Chris Gagnon ]
* add missing unity-scope-click dependancy to unity8-autopilot package
  (LP: #1336276)
[ Michael Terry ]
* Don't lock phone if user tries to switch back to an active call.
  (LP: #1388156)
[ Daniel d'Andrada ]
* DirectionalDragArea: Update TODO comment in light of new events
* TouchDispatcher: synthesize MouseButtonDblClick events
[ Leonardo Arias Fonseca ]
* Removed the tests for the alternate paths of the autopilot helpers.
[ Michael Terry ]
* Provide 'passphrase' as a field of Components.Lockscreen
* Fix a race between Qml loading and DBus registration that caused
  problems when jenkins tried to unlock the phone.
* Set domain explicitly for the Dialogs component because the welcome
  wizard wants to import it. (LP: #1381731)
* When greeter or lockscreen has focus, show active call panel. (LP:
  #1378872)
[ Ted Gould ]
* Set the default OOM score for the dash (LP: #1379786)
[ Michał Sawicz ]
* Revert lp:~unity-team/unity8/flickables-speed-workaround to avoid
  risk in RTM.
* Updated behaviour for zoomable image, workaround for sourcesize (LP:
  #1333187)
[ Michael Frey ]
* Added a check for Proximity to determine if we show the lock screen.
  (LP: #1378012)
[ Ying-Chun Liu ]
* Add non-interactive code into GenericScopeView. (LP: #1384441)
[ Mirco Müller ]
* Also use modal nature of snap-decision notifications when
  greeter/lockscreen is shown. This fixes LP: #1378827. (LP: #1378827)
[ Michael Zanetti ]
* Make the launcher update on dconf changes (LP: #1376707)
* exit spread on background tap (LP: #1368261)
* Use an index instead of a scope id in DashCommunicator (LP:
  #1376044)
[ Andrea Cimitan ]
* Updated behaviour for zoomable image, workaround for sourcesize (LP:
  #1333187)
[ Daniel d'Andrada ]
* Make TouchGate synthesize QMouseEvents for mouse-based target items
* Don't specify a distanceThreshold as it conflicts with
  hintDisplacment
[ josharenson ]
* Fix lp:1370240 by making stages interactive when a snap decision is
  dismissed. (LP: #1370240)
[ Nick Dedekind ]
* remove qml ownership confusion for caching unitymenumodels (LP:
  #1368856)
* Implementation of expandable panel design (LP: #1368856)
[ Albert Astals ]
* CardAttributes: Specify column and row since the gridlayout gets
  confused sometimes (LP: #1381092)
* Reset VerticalJournal until the cardTool settles (LP: #1381255)
[ Mirco Müller ]
* Added synchronous/confirmation notification support to unity8. (LP:
  #1232633)
[ Michael Zanetti ]
* Fix lp:1370240 by making stages interactive when a snap decision is
  dismissed. (LP: #1370240)
* Drop all visual indication of "pinning" (LP: #1381054)
[ Antti Kaijanmäki ]
* Unlock all modems on boot. (LP: #1333121)
[ Michael Terry ]
* Don't show initial lockscreen during the edge demo. The user just
  set up their phone with a password, it's pointless to ask them
  again. (LP: #1358283)
* Distinguish between incoming calls and other dialer-app opens. (LP:
  #1378218) (LP: #1378218)
[ Andrea Cimitan ]
* Fix flickable speed to be resolution independent, by subclassing
  components (LP: #1348557)
[ Michał Sawicz ]
* Fix the ShellWithPin test and some functionality.
[ Albert Astals ]
* Move Base.qml to DashCategoryBase
* Fix first item positioning when m_clipItem->y() is not 0 (LP:
  #1251597)
* Fix some small qml warnings
[ Daniel d'Andrada ]
* Add touch ownership logic on top of qt input handling
[ Michał Sawicz ]
* Rename datetime indicator in test
[ Albert Astals ]
* Close overview temp scope on show dash (LP: #1373819)
* Enable QT_STRICT_ITERATORS
* Make Base not clickable, since we don't use it in anywhere clickable
  (we only use it for Category delegates in the LVWPH) (LP: #1300709)
* Hide preview if it was visible when going to a scope (LP: #1374548)
* Remove contentScale variable
[ Andrea Cimitan ]
* Fix card implicitHeight when summary is declared, but its text is
  empty. Also fixes vertical journal height and clipping (LP:
  #1362160)
* Redesign for pinned apps. Remove thindivider on top of ubuntu dash
  button (not needed anymore) (LP: #1377100)
[ Ying-Chun Liu ]
* Fix run_on_device.sh to let it run again.
[ Nick Dedekind ]
* Fixed indicator menu bindings to server toggle value broken by user
  interaction. (LP: #1336715)
* Force rendering so we don't get stuck in "waitForRendering" loop in
  tests.
[ Daniel d'Andrada ]
* PhoneStage: focus the new topmost app after the current one closes
  itself (LP: #1375267)
[ Michael Terry ]
* Fix some security issues with the tablet greeter, which allowed the
  lockscreen to be bypassed. (LP: #1367715) (LP: #1367715)
[ Michael Zanetti ]
* scale down errorText label if necessary (LP: #1378848)
[ Michael Zanetti ]
* Dual SIM pin unlocking. Hook up the UI to the backend. (LP:
  #1267135)
[ Antti Kaijanmäki ]
* Dual SIM pin unlocking. Hook up the UI to the backend. (LP:
  #1267135)
[ Ubuntu daily release ]
* New rebuild forced
[ Andrea Cimitan ]
* Tweak card header to match the spec
* Add preview image slideshow (LP: #1351537)
[ Michał Sawicz ]
* Cache more things in memory, so flicking scopes should be faster
  (LP: #1336724)
* Tweak card header to match the spec
* Save texture memory by limiting sourceSize (LP: #1338430)
[ Ying-Chun Liu ]
* Add attributes to Preview. (LP: #1282460)
[ Albert Astals ]
* Update pot
* Cache more things in memory, so flicking scopes should be faster
  (LP: #1336724)
* Save texture memory by limiting sourceSize (LP: #1338430)
* Clip the settings list
* Fix unlocking from the left again
* Add wait_ makes tests more reliable
[ Michael Zanetti ]
* fix fading out the launcher instead of sliding it out on left-edge
  minimizing an app.
* Make the DashCommunicator async and more flexible to handle a
  lifecycle-suspended dash (LP: #1339883)
[ Michael Terry ]
* Retry unlock-device script if it fails, as there is always a risk of
  a small race with boot-up. (LP: #1370644)
* Add pull-to-refresh functionality to scopes. (LP: #1368336)
[ CI bot ]
* Resync trunk
[ Alexandros Frantzis ]
* Remove stale trusted socket before starting unity8 from upstart (LP:
  #1371597) (LP: #1371597)
[ CI bot ]
* Resync trunk
[ Andrea Cimitan ]
* Move activity indicator on top of keyboard (LP: #1354519)
[ Gerry Boland ]
* Cleanup: Remove unused member and fix small syntax error in
  OrientationLock
[ josharenson ]
* Fix lp:1367894 by correcting how the minute value is calculated in
  the panel. (LP: #1367894)
[ Nick Dedekind ]
* Fixed DefaultIndicatorPage test. Fixed warnings from test.
[ Ying-Chun Liu ]
* Remove maxLineCount in preview. (LP: 1328513) (LP: #1328513)
[ Michael Terry ]
* Fix some code that accidentally landed in trunk before it got
  cleaned up. The current code just has some duplication to it that
  should be unified.
* Implement latest visual designs for passphrase lockscreen.
* Make it easier to use the Lockscreen component from the welcome
  wizard.
* Limit how much memory we reserve for the greeter background image,
  allowing giant images to appear correctly.
[ Daniel d'Andrada ]
* Add gdbTestComponentName build targets
[ CI bot ]
* Resync trunk
[ Nick Dedekind ]
* Visual changes for indicator RTM polishing (LP: #1329289)
[ Ubuntu daily release ]
* New rebuild forced
[ Michael Zanetti ]
* fix swiping away the launcher from the left edge
* fix indicators AP test
[ Florian Boucault ]
* New Splash screen implementation that fakes real app
[ Albert Astals ]
* We need this in build-depends so that qmluitests pass in CI
[ Daniel d'Andrada ]
* New Splash screen implementation that fakes real app
[ Michael Terry ]
* Fix LC_ALL and test harder by making both manual runs of
  timeformattertest and the whole test suite use the same locale
  settings.
[ CI bot ]
* Resync trunk
[ Michał Sawicz ]
* Add -windowgeometry option to the Dash and drop any user-visible
  mentions of Dash
* Dash: Fix issue when expanding a category and collapsing another one
  at the same time.
[ Albert Astals ]
* Dash: Fix issue when expanding a category and collapsing another one
  at the same time.
* Make the categoryView invisible when we are in the preview mode (LP:
  #1341205)
* Pixel pushing in the dash header (LP: #1365929)
[ Ying-Chun Liu ]
* Re-add restart button for power menu. (LP: 1358197) (LP: #1358197)
[ Marcus Tomlinson ]
* Don't show a preview if a null response is returned from
  scope.preview(result)
[ Mirco Müller ]
* Don't limit the number of text-lines for body-text. (LP: #1369438)
[ Michael Zanetti ]
* Don't hide launcher when nothing happens on long left edge swipes
  (LP: #1357333)
* Rework LauncherBackend
[ Michael Terry ]
* When running qmluitests, make sure that they use LANGUAGE=C, fixing
  a test failure when running locally in the US.
[ Daniel d'Andrada ]
* Some ApplicationWindow test improvements
[ Rodney Dawes ]
* Check purchase state to determine if purchase was cancelled and hide
  progress. (LP: #1362622)
[ Michael Zanetti ]
* Focus first app if there are already some running when we're
  starting up (LP: #1339883)
[ Michał Sawicz ]
* Don't play empty urls in Notification.qml
[ Daniel d'Andrada ]
* Improve tst_Shell
* Build without any warnings
* Make tst_Card work from outside the source tree (LP:1359201) (LP:
  #1359201)

1266. By dobey on 2014-12-19

Add comment about using :native for g++-4.9 to existing g++4.9 comment.

dobey (dobey) wrote :

Added.

On Mon, 2014-12-15 at 09:07 +0000, Michał Sawicz wrote:
> Review: Needs Fixing
>
> Dobey, can you please add a comment as per what Colin wrote above, and let's merge it.

Michał Sawicz (saviq) wrote :

Yup, let's get this in.

review: Approve
Albert Astals Cid (aacid) :
review: Abstain

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 2014-12-08 18:15:11 +0000
3+++ debian/control 2014-12-19 16:07:38 +0000
4@@ -10,8 +10,10 @@
5 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
6 # We rely on C++11 features, and to prevent from ABI breaks
7 # in libstdc++ causing us issues, we explicitly select a G++
8-# version.
9- g++-4.9,
10+# version. To allow cross-compiling to work, we also must
11+# append :native to g++-4.9 so we don't try to run armhf g++
12+# on an x86 CPU for eaxmple, when cross-compiling.
13+ g++-4.9:native,
14 libconnectivity-qt1-dev,
15 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
16 libgl1-mesa-dri,

Subscribers

People subscribed via source and target branches