← Back to branch summary

~ubuntu-branches/ubuntu/precise/firefox/precise-proposed

« back to all changes in this revision

Viewing changes to debian/patches/no-sps-profiler-on-unsupported-archs.patch

  • Committer: Package Import Robot
  • Author(s): Chris Coulson, Jamie Strandboge, Chris Coulson
  • Date: 2012-03-08 16:15:52 UTC
  • mfrom: (1.1.78)
  • Revision ID: package-import@ubuntu.com-20120308161552-1rwojqdh93lgb4f6
Tags: 11.0~b6+build1-0ubuntu1
https://launchpad.net/bugs/911494
https://launchpad.net/bugs/728485
https://launchpad.net/bugs/926495
* New upstream release from the beta channel (FIREFOX_11_0b6_BUILD1)

[ Jamie Strandboge <jamie@ubuntu.com> ]
* debian/usr.bin.firefox.apparmor.*:
  - allow access to statm and smaps for about:memory (LP: #911494)
  - allow read access to files in /opt (LP: #728485)

[ Chris Coulson <chris.coulson@canonical.com> ]
* Update debian/patches/fix-build-failure-without-yarr-jit.patch
* Fix LP: #926495 - Disable the SPS profiler on unsupported architectures
  - add debian/patches/no-sps-profiler-on-unsupported-archs.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/no-sps-profiler-on-unsupported-archs.patch
 
1
Index: mozilla/tools/profiler/Makefile.in
 
2
===================================================================
 
3
--- mozilla.orig/tools/profiler/Makefile.in     2012-03-07 02:11:41.000000000 +0000
 
4
+++ mozilla/tools/profiler/Makefile.in  2012-03-08 15:33:02.506149247 +0000
 
5
@@ -74,7 +74,7 @@
 
6
   Profiler.jsm \
 
7
   $(NULL)
 
8
 
 
9
-ifneq (,$(filter Android Linux,$(OS_TARGET)))
 
10
+ifeq ($(filter-out Android Linux, $(OS_TARGET)),$(filter-out arm% %86 x86_64, $(TARGET_CPU)))
 
11
 
 
12
 DEFINES += -DMOZ_ENABLE_PROFILER_SPS