diff options
| author | Martin Stransky <stransky@redhat.com> | 2014-08-28 12:12:52 +0200 |
|---|---|---|
| committer | Martin Stransky <stransky@redhat.com> | 2014-08-28 12:12:52 +0200 |
| commit | 42e16eaf782cf0832b7f7ddf8eb01d82f3746c41 (patch) | |
| tree | c116ae3d41d37c00a6f6cd2759eee479d09b4191 | |
| parent | Arm build fix (diff) | |
| parent | build fixes - wip (diff) | |
| download | librewolf-fedora-ff-42e16eaf782cf0832b7f7ddf8eb01d82f3746c41.tar.gz librewolf-fedora-ff-42e16eaf782cf0832b7f7ddf8eb01d82f3746c41.tar.bz2 librewolf-fedora-ff-42e16eaf782cf0832b7f7ddf8eb01d82f3746c41.zip | |
Merge branch 'master' of ssh://pkgs.fedoraproject.org/firefox
| -rw-r--r-- | firefox-build.patch | 11 | ||||
| -rw-r--r-- | firefox.spec | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/firefox-build.patch b/firefox-build.patch new file mode 100644 index 0000000..262337c --- /dev/null +++ b/firefox-build.patch @@ -0,0 +1,11 @@ +diff -up firefox-32.0/mozilla-release/media/libstagefright/moz.build.old firefox-32.0/mozilla-release/media/libstagefright/moz.build +--- firefox-32.0/mozilla-release/media/libstagefright/moz.build.old 2014-08-26 05:38:08.000000000 +0200 ++++ firefox-32.0/mozilla-release/media/libstagefright/moz.build 2014-08-27 15:40:12.030299348 +0200 +@@ -120,7 +120,6 @@ elif CONFIG['GNU_CXX']: + '-Wno-sign-compare' + ] + CXXFLAGS += [ +- '-Wno-format', + '-Wno-multichar', + '-Wno-sign-compare', + '-Wno-unused', diff --git a/firefox.spec b/firefox.spec index 57d1f54..fc6fcca 100644 --- a/firefox.spec +++ b/firefox.spec @@ -104,6 +104,7 @@ Source23: firefox.1 #Build patches Patch0: firefox-install-dir.patch +Patch1: firefox-build.patch Patch3: mozilla-build-arm.patch # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3 Patch18: xulrunner-24.0-jemalloc-ppc.patch @@ -215,6 +216,7 @@ cd %{tarballdir} # there is a compare of config and js/config directories and .orig suffix is # ignored during this compare. %patch0 -p1 +%patch1 -p2 -b .build %ifarch %{arm} %patch3 -p2 -b .arm @@ -356,6 +358,8 @@ find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';' # MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | %{__sed} -e 's/-Wall//') #rhbz#1037063 +# -Werror=format-security causes build failures when -Wno-format is explicitly given +# for some sources MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security" %if %{?debug_build} MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//') |