diff options
| -rw-r--r-- | firefox.spec | 9 | ||||
| -rw-r--r-- | prio-nss-build.patch | 88 |
2 files changed, 5 insertions, 92 deletions
diff --git a/firefox.spec b/firefox.spec index 44047da..c58202f 100644 --- a/firefox.spec +++ b/firefox.spec @@ -126,7 +126,6 @@ Patch37: build-jit-atomic-always-lucky.patch Patch38: build-cacheFlush-missing.patch Patch40: build-aarch64-skia.patch Patch41: build-disable-elfhack.patch -Patch42: prio-nss-build.patch Patch44: mozilla-1494037.patch Patch46: firefox-debug-build.patch @@ -339,8 +338,6 @@ This package contains results of tests executed during build. %patch41 -p1 -b .disable-elfhack %endif %patch3 -p1 -b .arm -# Build with system nss -#%patch42 -p1 -b .nss-build %patch44 -p1 -b .1494037 %patch46 -p1 -b .debug @@ -547,13 +544,17 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now" %if %{?debug_build} MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//') %endif -%ifarch s390 %{arm} +%ifarch s390 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/') # If MOZ_DEBUG_FLAGS is empty, firefox's build will default it to "-g" which # overrides the -g1 from line above and breaks building on s390/arm # (OOM when linking, rhbz#1238225) export MOZ_DEBUG_FLAGS=" " %endif +%ifarch %{arm} +MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g0/') +export MOZ_DEBUG_FLAGS=" " +%endif %if !0%{?build_with_clang} %ifarch s390 %{arm} ppc aarch64 %{ix86} MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" diff --git a/prio-nss-build.patch b/prio-nss-build.patch deleted file mode 100644 index 3854572..0000000 --- a/prio-nss-build.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -up firefox-63.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-63.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium -diff -up firefox-63.0/media/webrtc/trunk/Makefile.old firefox-63.0/media/webrtc/trunk/Makefile -diff -up firefox-63.0/third_party/prio/include/mprio.h.old firefox-63.0/third_party/prio/include/mprio.h ---- firefox-63.0/third_party/prio/include/mprio.h.old 2018-10-18 15:10:24.616102952 +0200 -+++ firefox-63.0/third_party/prio/include/mprio.h 2018-10-18 15:10:33.853076714 +0200 -@@ -14,9 +14,9 @@ extern "C" { - #endif - - #include <msgpack.h> --#include <nss/blapit.h> --#include <nss/pk11pub.h> --#include <nss/seccomon.h> -+#include <blapit.h> -+#include <pk11pub.h> -+#include <seccomon.h> - #include <stdbool.h> - #include <stddef.h> - -diff -up firefox-63.0/third_party/prio/prio/encrypt.c.old firefox-63.0/third_party/prio/prio/encrypt.c ---- firefox-63.0/third_party/prio/prio/encrypt.c.old 2018-10-18 15:15:08.279250181 +0200 -+++ firefox-63.0/third_party/prio/prio/encrypt.c 2018-10-18 15:15:14.614229961 +0200 -@@ -6,9 +6,9 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - --#include <nss/keyhi.h> --#include <nss/keythi.h> --#include <nss/pk11pub.h> -+#include <keyhi.h> -+#include <keythi.h> -+#include <pk11pub.h> - #include <prerror.h> - - #include "encrypt.h" -diff -up firefox-63.0/third_party/prio/prio/prg.c.old firefox-63.0/third_party/prio/prio/prg.c ---- firefox-63.0/third_party/prio/prio/prg.c.old 2018-10-18 15:15:21.364208421 +0200 -+++ firefox-63.0/third_party/prio/prio/prg.c 2018-10-18 15:15:27.542188720 +0200 -@@ -7,8 +7,8 @@ - */ - - #include <mprio.h> --#include <nss/blapit.h> --#include <nss/pk11pub.h> -+#include <blapit.h> -+#include <pk11pub.h> - #include <string.h> - - #include "prg.h" -diff -up firefox-63.0/third_party/prio/prio/prg.h.old firefox-63.0/third_party/prio/prio/prg.h ---- firefox-63.0/third_party/prio/prio/prg.h.old 2018-10-18 15:15:35.511163303 +0200 -+++ firefox-63.0/third_party/prio/prio/prg.h 2018-10-18 15:15:40.568147167 +0200 -@@ -10,7 +10,7 @@ - #define __PRG_H__ - - #include <mpi.h> --#include <nss/blapit.h> -+#include <blapit.h> - #include <stdlib.h> - - #include "config.h" -diff -up firefox-63.0/third_party/prio/prio/rand.c.old firefox-63.0/third_party/prio/prio/rand.c ---- firefox-63.0/third_party/prio/prio/rand.c.old 2018-10-18 15:15:49.967117182 +0200 -+++ firefox-63.0/third_party/prio/prio/rand.c 2018-10-18 15:16:00.130084760 +0200 -@@ -8,9 +8,9 @@ - - #include <limits.h> - #include <mprio.h> --#include <nss/nss.h> --#include <nss/pk11pub.h> --#include <nspr/prinit.h> -+#include <nss.h> -+#include <pk11pub.h> -+#include <prinit.h> - - #include "debug.h" - #include "rand.h" -diff -up firefox-63.0/third_party/prio/prio/rand.h.old firefox-63.0/third_party/prio/prio/rand.h ---- firefox-63.0/third_party/prio/prio/rand.h.old 2018-10-18 15:14:49.689309517 +0200 -+++ firefox-63.0/third_party/prio/prio/rand.h 2018-10-18 15:14:56.789286855 +0200 -@@ -10,7 +10,7 @@ - #define __RAND_H__ - - #include <mpi.h> --#include <nss/seccomon.h> -+#include <seccomon.h> - #include <stdlib.h> - - /* |