Unity

Merge lp:~bregma/unity/lp-1317276 into lp:unity

  1. lp-1317276
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3805
Proposed branch: lp:~bregma/unity/lp-1317276
Merge into: lp:unity
Diff against target: 26 lines (+9/-5)
1 file modified
debian/rules (+9/-5)
To merge this branch: bzr merge lp:~bregma/unity/lp-1317276
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
Review via email: mp+219246@code.launchpad.net

Commit message

disabled precompiled headers on arm64 Ubuntu package builds

Description of the change

Disables the use of precompiled headers on the arm64 architecture, it seems to cause vague and itinerant internal compiler exceptions.

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2014-04-09 12:38:25 +0000
3+++ debian/rules 2014-05-12 18:37:58 +0000
4@@ -23,13 +23,17 @@
5
6 SCOPES_RECOMMENDS := $(shell perl debian/scopes-recommends-generator /usr/share/unity/client-scopes.json)
7
8+cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
9+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
10+ cmake_gl_options := -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON
11+endif
12+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), arm64))
13+ cmake_pch_options := -Duse_pch=OFF
14+endif
15+
16
17 override_dh_auto_configure:
18-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
19- dh_auto_configure -- -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON
20-else
21- dh_auto_configure -- -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
22-endif
23+ dh_auto_configure -- $(cmake_base_options) $(cmake_gl_options) $(cmake_pch_options)
24
25 override_dh_install:
26 # install autopilot tests