Merge lp:~ricmm/platform-api/gcc-4.7-abi into lp:platform-api

Proposed by Ricardo Mendoza
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 75
Merged at revision: 75
Proposed branch: lp:~ricmm/platform-api/gcc-4.7-abi
Merge into: lp:platform-api
Diff against target: 24 lines (+3/-0)
2 files modified
debian/control (+1/-0)
debian/rules (+2/-0)
To merge this branch: bzr merge lp:~ricmm/platform-api/gcc-4.7-abi
Reviewer Review Type Date Requested Status
Ricardo Salveti (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+171643@code.launchpad.net

Commit message

GCC 4.8 introduces a change for ARM AAPCS calling conventions, this breaks ABI for us because the Android library is built with GCC 4.7.

Revert to building platform-api with GCC 4.7 until we can update the Android build.

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
Ricardo Salveti (rsalveti) wrote :

Good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2013-06-14 21:06:57 +0000
+++ debian/control 2013-06-26 19:23:26 +0000
@@ -3,6 +3,7 @@
3Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>3Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
4Build-Depends: cmake,4Build-Depends: cmake,
5 debhelper (>= 9),5 debhelper (>= 9),
6 g++-4.7,
6 libgl1-mesa-dev[!armhf],7 libgl1-mesa-dev[!armhf],
7 libgles2-mesa-dev[armhf],8 libgles2-mesa-dev[armhf],
8 libhybris-dev,9 libhybris-dev,
910
=== modified file 'debian/rules'
--- debian/rules 2013-06-14 21:06:57 +0000
+++ debian/rules 2013-06-26 19:23:26 +0000
@@ -2,6 +2,8 @@
22
3DPKG_GENSYMBOLS_CHECK_LEVEL = 43DPKG_GENSYMBOLS_CHECK_LEVEL = 4
44
5export CXX=g++-4.7
6
5gles2_architectures := armhf7gles2_architectures := armhf
6ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))8ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
7 use_gles=19 use_gles=1

Subscribers

People subscribed via source and target branches