Removed wrong and unnecessary patch for aarch64
This commit is contained in:
Martin Stransky
parent
2e164b4b38
commit
4c8e8dd622
@ -1,72 +0,0 @@
|
|||||||
diff -up firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py.aarch64 firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py
|
|
||||||
--- firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py.aarch64 2015-03-11 12:58:25.871608312 +0100
|
|
||||||
+++ firefox-36.0.1/mozilla-release/gfx/skia/generate_mozbuild.py 2015-03-11 12:58:25.877608353 +0100
|
|
||||||
@@ -27,7 +27,7 @@ footer = """
|
|
||||||
# can we find a better way of dealing with asm sources?
|
|
||||||
|
|
||||||
# left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
|
|
||||||
-if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
|
|
||||||
+if not CONFIG['INTEL_ARCHITECTURE'] and (CONFIG['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and CONFIG['GNU_CC']:
|
|
||||||
SOURCES += [
|
|
||||||
'trunk/src/opts/memset.arm.S',
|
|
||||||
]
|
|
||||||
@@ -123,7 +123,7 @@ if CONFIG['INTEL_ARCHITECTURE'] and CONF
|
|
||||||
SOURCES['trunk/src/opts/SkMorphology_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
|
|
||||||
SOURCES['trunk/src/opts/SkUtils_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
|
|
||||||
SOURCES['trunk/src/opts/SkXfermode_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
|
|
||||||
-elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['BUILD_ARM_NEON']:
|
|
||||||
+elif (CONFIG['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and CONFIG['GNU_CC'] and CONFIG['BUILD_ARM_NEON']:
|
|
||||||
DEFINES['__ARM_HAVE_OPTIONAL_NEON_SUPPORT'] = 1
|
|
||||||
DEFINES['USE_ANDROID_NDK_CPU_FEATURES'] = 0
|
|
||||||
elif CONFIG['CLANG_CL']:
|
|
||||||
@@ -440,7 +440,7 @@ def write_mozbuild(includes, sources):
|
|
||||||
f.write("if CONFIG['INTEL_ARCHITECTURE']:\n")
|
|
||||||
write_sources(f, sources['intel'], 4)
|
|
||||||
|
|
||||||
- f.write("elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:\n")
|
|
||||||
+ f.write("elif (CONFIG['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and CONFIG['GNU_CC']:\n")
|
|
||||||
write_sources(f, sources['arm'], 4)
|
|
||||||
|
|
||||||
f.write(" if CONFIG['BUILD_ARM_NEON']:\n")
|
|
||||||
diff -up firefox-36.0.1/mozilla-release/gfx/skia/moz.build.aarch64 firefox-36.0.1/mozilla-release/gfx/skia/moz.build
|
|
||||||
--- firefox-36.0.1/mozilla-release/gfx/skia/moz.build.aarch64 2015-03-11 12:58:25.000000000 +0100
|
|
||||||
+++ firefox-36.0.1/mozilla-release/gfx/skia/moz.build 2015-03-11 13:14:49.627295630 +0100
|
|
||||||
@@ -811,7 +811,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
|
|
||||||
'trunk/src/opts/SkUtils_opts_SSE2.cpp',
|
|
||||||
'trunk/src/opts/SkXfermode_opts_SSE2.cpp',
|
|
||||||
]
|
|
||||||
-elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
|
|
||||||
+elif (CONFIG['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and CONFIG['GNU_CC']:
|
|
||||||
UNIFIED_SOURCES += [
|
|
||||||
'trunk/src/core/SkUtilsArm.cpp',
|
|
||||||
'trunk/src/opts/SkBitmapProcState_opts_arm.cpp',
|
|
||||||
@@ -858,7 +858,7 @@ else:
|
|
||||||
# can we find a better way of dealing with asm sources?
|
|
||||||
|
|
||||||
# left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
|
|
||||||
-if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
|
|
||||||
+if not CONFIG['INTEL_ARCHITECTURE'] and (CONFIG['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and CONFIG['GNU_CC']:
|
|
||||||
SOURCES += [
|
|
||||||
'trunk/src/opts/memset.arm.S',
|
|
||||||
]
|
|
||||||
@@ -950,7 +950,7 @@ if CONFIG['INTEL_ARCHITECTURE'] and CONF
|
|
||||||
SOURCES['trunk/src/opts/SkMorphology_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
|
|
||||||
SOURCES['trunk/src/opts/SkUtils_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
|
|
||||||
SOURCES['trunk/src/opts/SkXfermode_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
|
|
||||||
-elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['BUILD_ARM_NEON']:
|
|
||||||
+elif (CONFIG['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and CONFIG['GNU_CC'] and CONFIG['BUILD_ARM_NEON']:
|
|
||||||
DEFINES['__ARM_HAVE_OPTIONAL_NEON_SUPPORT'] = 1
|
|
||||||
DEFINES['USE_ANDROID_NDK_CPU_FEATURES'] = 0
|
|
||||||
elif CONFIG['CLANG_CL']:
|
|
||||||
diff -up firefox-36.0.1/mozilla-release/gfx/ycbcr/moz.build.aarch64 firefox-36.0.1/mozilla-release/gfx/ycbcr/moz.build
|
|
||||||
--- firefox-36.0.1/mozilla-release/gfx/ycbcr/moz.build.aarch64 2015-03-05 11:28:10.000000000 +0100
|
|
||||||
+++ firefox-36.0.1/mozilla-release/gfx/ycbcr/moz.build 2015-03-11 12:58:25.877608353 +0100
|
|
||||||
@@ -61,7 +61,7 @@ else:
|
|
||||||
'yuv_row_other.cpp',
|
|
||||||
]
|
|
||||||
|
|
||||||
-if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
|
|
||||||
+if (CONFIG['CPU_ARCH'] == 'arm' or CONFIG['CPU_ARCH'] == 'aarch64') and CONFIG['HAVE_ARM_NEON']:
|
|
||||||
SOURCES += [
|
|
||||||
'yuv_row_arm.s',
|
|
||||||
]
|
|
||||||
@ -107,7 +107,7 @@
|
|||||||
Summary: Mozilla Firefox Web browser
|
Summary: Mozilla Firefox Web browser
|
||||||
Name: firefox
|
Name: firefox
|
||||||
Version: 36.0.1
|
Version: 36.0.1
|
||||||
Release: 4%{?pre_tag}%{?dist}
|
Release: 5%{?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
|
||||||
@ -127,7 +127,6 @@ Source24: mozilla-api-key
|
|||||||
Patch0: firefox-install-dir.patch
|
Patch0: firefox-install-dir.patch
|
||||||
Patch1: firefox-build.patch
|
Patch1: firefox-build.patch
|
||||||
Patch3: mozilla-build-arm.patch
|
Patch3: mozilla-build-arm.patch
|
||||||
Patch4: firefox-aarch64.patch
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
|
# https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3
|
||||||
Patch18: xulrunner-24.0-jemalloc-ppc.patch
|
Patch18: xulrunner-24.0-jemalloc-ppc.patch
|
||||||
# workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found)
|
# workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found)
|
||||||
@ -289,7 +288,6 @@ cd %{tarballdir}
|
|||||||
%patch23 -p1 -b .1005535
|
%patch23 -p1 -b .1005535
|
||||||
|
|
||||||
%patch3 -p2 -b .arm
|
%patch3 -p2 -b .arm
|
||||||
%patch4 -p2 -b .aarch64
|
|
||||||
|
|
||||||
# For branding specific patches.
|
# For branding specific patches.
|
||||||
|
|
||||||
@ -767,7 +765,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Mar 10 2015 Martin Stransky <stransky@redhat.com> - 36.0.1-4
|
* Tue Mar 10 2015 Martin Stransky <stransky@redhat.com> - 36.0.1-5
|
||||||
- Arm build fix
|
- Arm build fix
|
||||||
|
|
||||||
* Mon Mar 9 2015 Jan Horak <jhorak@redhat.com> - 36.0.1-1
|
* Mon Mar 9 2015 Jan Horak <jhorak@redhat.com> - 36.0.1-1
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user