diff options
Diffstat (limited to 'source/xap')
| -rw-r--r-- | source/xap/mozilla-thunderbird/gkrust.a.no.networking.check.diff | 31 | ||||
| -rwxr-xr-x | source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild | 5 |
2 files changed, 1 insertions, 35 deletions
diff --git a/source/xap/mozilla-thunderbird/gkrust.a.no.networking.check.diff b/source/xap/mozilla-thunderbird/gkrust.a.no.networking.check.diff deleted file mode 100644 index 115ba0e7a..000000000 --- a/source/xap/mozilla-thunderbird/gkrust.a.no.networking.check.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- ./config/makefiles/rust.mk.orig 2021-03-15 12:42:08.219987929 -0500 -+++ ./config/makefiles/rust.mk 2021-03-15 12:43:15.996984180 -0500 -@@ -332,17 +332,17 @@ - # the chance of proxy bypasses originating from rust code. - # The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS. - # Sanitizers and sancov also fail because compiler-rt hooks network functions. --ifndef MOZ_PROFILE_GENERATE --ifeq ($(OS_ARCH), Linux) --ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) --ifndef MOZ_LTO_RUST_CROSS --ifneq (,$(filter -Clto,$(cargo_rustc_flags))) -- $(call py_action,check_binary,--target --networking $@) --endif --endif --endif --endif --endif -+#ifndef MOZ_PROFILE_GENERATE -+#ifeq ($(OS_ARCH), Linux) -+#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) -+#ifndef MOZ_LTO_RUST_CROSS -+#ifneq (,$(filter -Clto,$(cargo_rustc_flags))) -+# $(call py_action,check_binary,--target --networking $@) -+#endif -+#endif -+#endif -+#endif -+#endif - - force-cargo-library-check: - $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag) diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index 58ecad05b..b02f7aaca 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -170,9 +170,6 @@ rm -rf obj-x86_64-pc-linux-gnu # Retain GTK+ v2 scrolling behavior: zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 -# Bypass a test that fails the build: -zcat $CWD/gkrust.a.no.networking.check.diff.gz | patch -p1 --verbose || exit 1 - # Fix header mismatch on x86 with GCC: if [ "$ARCH" = "i686" -a "$CC" = "gcc" ]; then zcat $CWD/double_t.x86.diff.gz | patch -p1 --verbose || exit 1 |