summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2019-12-14 11:39:57 +0100
committerAndreas Baumann <mail@andreasbaumann.cc>2019-12-14 11:39:57 +0100
commit1581d4da9994af5747b5dde4dd024e0691838f7f (patch)
tree005d65f90c27d7003060d4746bb9e5118682b837 /extra
parentbbf139b9303dc6b712efb64157b947d1bfb48df2 (diff)
downloadpackages-1581d4da9994af5747b5dde4dd024e0691838f7f.tar.xz
extra/firefox: redone rust static patch
Diffstat (limited to 'extra')
-rw-r--r--extra/firefox/PKGBUILD2
-rw-r--r--extra/firefox/rust-static-disable-network-test-on-static-libraries.patch12
2 files changed, 9 insertions, 5 deletions
diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD
index c89c5052..e20df7ea 100644
--- a/extra/firefox/PKGBUILD
+++ b/extra/firefox/PKGBUILD
@@ -96,7 +96,7 @@ eval "$(
# test failure in rust code (complaining about network functions) when PGO is used,
# see https://bugzilla.mozilla.org/show_bug.cgi?id=1565757
source+=('rust-static-disable-network-test-on-static-libraries.patch')
-sha256sums+=('d07e283d5c784bb44dcd0ad3f6b82f19cac562451ce07033e8dde50bf8c75d76')
+sha256sums+=('2cf35cc22b4a9bccfaca403abed5621d666a5d6d3c87774b3f151265c6d6e090')
eval "$(
declare -f prepare | \
sed '
diff --git a/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch b/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch
index 32dabb4c..4d6c9ee6 100644
--- a/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch
+++ b/extra/firefox/rust-static-disable-network-test-on-static-libraries.patch
@@ -1,24 +1,28 @@
diff -rauN a/config/makefiles/rust.mk b/config/makefiles/rust.mk
---- a/config/makefiles/rust.mk 2019-10-25 10:57:20.061421120 +0200
-+++ b/config/makefiles/rust.mk 2019-10-25 11:06:30.065708309 +0200
-@@ -252,13 +252,13 @@
- # that we are not importing any networking-related functions in rust code. This reduces
+--- a/config/makefiles/rust.mk 2019-12-02 13:22:52.000000000 +0100
++++ b/config/makefiles/rust.mk 2019-12-14 11:02:19.896773114 +0100
+@@ -265,15 +265,15 @@
# the chance of proxy bypasses originating from rust code.
# The check only works when rust code is built with -Clto.
+ # Enabling sancov also causes this to fail.
-ifndef MOZ_PROFILE_GENERATE
-ifeq ($(OS_ARCH), Linux)
+-ifeq (,$(rustflags_sancov))
-ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
- $(call py_action,check_binary,--target --networking $@)
-endif
-endif
-endif
+-endif
+#ifndef MOZ_PROFILE_GENERATE
+#ifeq ($(OS_ARCH), Linux)
++#ifeq (,$(rustflags_sancov))
+#ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
+# $(call py_action,check_binary,--target --networking $@)
+#endif
+#endif
+#endif
++#endif
force-cargo-library-check:
$(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag)