Merge branch 'master' into f24
This commit is contained in:
commit
c246f4ee64
@ -131,6 +131,7 @@ Patch400: mozilla-1255590.patch
|
||||
Patch402: mozilla-1196777.patch
|
||||
Patch403: mozilla-1216658.patch
|
||||
Patch404: mozilla-1270046.patch
|
||||
# Remove when mozbz#1269319 lands
|
||||
Patch405: mozilla-1245783.patch
|
||||
|
||||
# Debian patches
|
||||
@ -349,6 +350,7 @@ echo "ac_add_options --with-arch=armv7-a" >> .mozconfig
|
||||
echo "ac_add_options --with-float-abi=hard" >> .mozconfig
|
||||
echo "ac_add_options --with-fpu=vfpv3-d16" >> .mozconfig
|
||||
echo "ac_add_options --disable-elf-hack" >> .mozconfig
|
||||
echo "ac_add_options --disable-ion" >> .mozconfig
|
||||
%endif
|
||||
%ifarch armv7hnl
|
||||
echo "ac_add_options --with-arch=armv7-a" >> .mozconfig
|
||||
|
@ -1,3 +1,5 @@
|
||||
# Remove when mozbz#1269319 lands
|
||||
|
||||
--- firefox-45.0.1-orig/js/src/Makefile.in 2016-05-17 14:53:58.753178403 +0200
|
||||
+++ firefox-45.0.1/js/src/Makefile.in 2016-05-17 14:53:28.432817862 +0200
|
||||
@@ -144,6 +144,11 @@ distclean::
|
||||
|
Loading…
Reference in New Issue
Block a user