From 2b16776365411b15d97f5fbe82005fc67625b9c3 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 27 Aug 2014 13:45:32 +0200 Subject: Build fix - make security warnings non-fatal --- firefox.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/firefox.spec b/firefox.spec index 4750b41..297b385 100644 --- a/firefox.spec +++ b/firefox.spec @@ -356,7 +356,9 @@ find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';' # MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | %{__sed} -e 's/-Wall//') #rhbz#1037063 -MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security" +# -Werror=format-security causes build failures when -Wno-format is explicitly given +# for some sources +MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat" %if %{?debug_build} MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//') %endif -- cgit From 2af3825c8be3203bafde3af2d924d0b69723adb7 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 28 Aug 2014 09:51:18 +0200 Subject: build fixes - wip --- firefox-build.patch | 11 +++++++++++ firefox.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 firefox-build.patch 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 297b385..d3e9dd4 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 @@ -358,7 +360,7 @@ 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" +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//') %endif -- cgit