rpms/firefox
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Arm build fix

Browse Source
This commit is contained in:
Martin Stransky 2014-03-19 12:08:51 +01:00
parent 8d20dc206d
commit e61423f806
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firefox.spec
View File

@ -86,14 +86,11 @@
%global tarballdir mozilla-release %global tarballdir mozilla-release
%endif %endif
%if %{disable_arm}
ExcludeArch: %{arm}
%endif
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 28.0 Version: 28.0
Release: 2%{?pre_tag}%{?dist} Release: 3%{?pre_tag}%{?dist}
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -222,7 +219,9 @@ cd %{tarballdir}
# ignored during this compare. # ignored during this compare.
%patch0 -p1 %patch0 -p1
%ifarch %{arm}
%patch3 -p2 -b .arm %patch3 -p2 -b .arm
%endif
%patch14 -p2 -b .chromium-types %patch14 -p2 -b .chromium-types
%patch17 -p1 -b .gcc47 %patch17 -p1 -b .gcc47
%patch18 -p2 -b .jemalloc-ppc %patch18 -p2 -b .jemalloc-ppc
@ -634,6 +633,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Wed Mar 19 2014 Martin Stransky <stransky@redhat.com> - 28.0-3
- Arm build fix
* Wed Mar 19 2014 Martin Stransky <stransky@redhat.com> - 28.0-2 * Wed Mar 19 2014 Martin Stransky <stransky@redhat.com> - 28.0-2
- NSS version up, disable arm for now - NSS version up, disable arm for now

20
mozilla-build-arm.patch
View File

@ -1,7 +1,7 @@
diff -up firefox-27.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-27.0/mozilla-release/gfx/ycbcr/moz.build diff -up firefox-28.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-28.0/mozilla-release/gfx/ycbcr/moz.build
--- firefox-27.0/mozilla-release/gfx/ycbcr/moz.build.arm 2014-01-28 05:03:42.000000000 +0100 --- firefox-28.0/mozilla-release/gfx/ycbcr/moz.build.arm 2014-03-11 01:54:04.000000000 +0100
+++ firefox-27.0/mozilla-release/gfx/ycbcr/moz.build 2014-02-03 11:14:34.062219509 +0100 +++ firefox-28.0/mozilla-release/gfx/ycbcr/moz.build 2014-03-11 10:12:19.586220802 +0100
@@ -61,7 +61,7 @@ else: @@ -59,7 +59,7 @@ else:
'yuv_row_other.cpp', 'yuv_row_other.cpp',
] ]
@ -10,3 +10,15 @@ diff -up firefox-27.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-27.0/mozil
SOURCES += [ SOURCES += [
'yuv_row_arm.s', 'yuv_row_arm.s',
] ]
diff -up firefox-28.0/mozilla-release/media/libtheora/lib/moz.build.arm firefox-28.0/mozilla-release/media/libtheora/lib/moz.build
--- firefox-28.0/mozilla-release/media/libtheora/lib/moz.build.arm 2014-03-11 01:54:13.000000000 +0100
+++ firefox-28.0/mozilla-release/media/libtheora/lib/moz.build 2014-03-19 12:00:57.491064764 +0100
@@ -20,7 +20,7 @@ UNIFIED_SOURCES += [
'state.c',
]
-if CONFIG['OS_TEST'] == 'arm' and CONFIG['GNU_AS']:
+if CONFIG['GNU_AS']:
GENERATED_SOURCES += [ '%s.%s' % (f, CONFIG['ASM_SUFFIX']) for f in [
'armbits-gnu',
'armfrag-gnu',