diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/d/rust/rust.SlackBuild | 8 | ||||
-rwxr-xr-x | source/xap/seamonkey/seamonkey.SlackBuild | 3 | ||||
-rw-r--r-- | source/xap/seamonkey/seamonkey.rust-1.45.diff | 12 |
3 files changed, 5 insertions, 18 deletions
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 22e5ccad6..9d0160f04 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -65,9 +65,11 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -# if you already have rust and cargo installed, you can bootstrap from the -# previous version. -if [ "$LOCAL_BOOTSTRAP" = "" ] && [ -x /usr/bin/cargo ] && [ -x /usr/bin/rustc ] ; then +# If the bootstrap binaries are present, use those. Otherwise bootstrap from +# installed compiler. +if /bin/ls *-unknown-linux-gnu.tar.gz 1> /dev/null 2> /dev/null ; then + LOCAL_BOOTSTRAP=no +else LOCAL_BOOTSTRAP=yes fi diff --git a/source/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild index 15b286a04..feacb5c11 100755 --- a/source/xap/seamonkey/seamonkey.SlackBuild +++ b/source/xap/seamonkey/seamonkey.SlackBuild @@ -122,9 +122,6 @@ cd seamonkey-${TARBALLVER} || exit 1 # Retain GTK+ v2 scrolling behavior: zcat $CWD/sm.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 -# Fix building with latest Rust: -zcat $CWD/seamonkey.rust-1.45.diff.gz | patch -p1 --verbose || exit 1 - # Make sure the perms/ownerships are sane: chown -R root:root . find . \ diff --git a/source/xap/seamonkey/seamonkey.rust-1.45.diff b/source/xap/seamonkey/seamonkey.rust-1.45.diff deleted file mode 100644 index bf7bf7a8f..000000000 --- a/source/xap/seamonkey/seamonkey.rust-1.45.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- ./mozilla/config/rules.mk.orig 2020-06-06 14:59:53.000000000 -0500 -+++ ./mozilla/config/rules.mk 2020-07-24 13:16:53.707149335 -0500 -@@ -874,7 +874,9 @@ - ifndef DEVELOPER_OPTIONS - ifndef MOZ_DEBUG_RUST - # Enable link-time optimization for release builds. -+# Pass -Clto and CARGO_PROFILE_RELEASE_LTO=true. - cargo_rustc_flags += -C lto -+export CARGO_PROFILE_RELEASE_LTO=true - endif - endif - |