From 1a12ec691ad3e0d48d97e7931df92e204c58cb64 Mon Sep 17 00:00:00 2001
From: hanshuang <hanshuang@uniontech.com>
Date: Fri, 10 Feb 2023 13:37:07 +0800
Subject: [PATCH] fix a7.9 compile problem

---
 download         |  1 +
 thunderbird.spec | 35 +++++++++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/download b/download
index 403cceb..e18d277 100644
--- a/download
+++ b/download
@@ -3,3 +3,4 @@ a9f32342fcac2b79f76860ee742d6ff1  cbindgen-vendor.tar.xz
 60a6a764b4a1feaa4cd6f89f8d165166  thunderbird-langpacks-102.3.0-20220916.tar.xz
 75157f5e77e1a4f460645a57ff54e552  nspr-4.34.0-3.el8_1.src.rpm
 04f69b8baa7bd8ddc49d786b04307df8  nss-3.79.0-6.el8_1.src.rpm
+f5186eae0d0728e2cdcb6c26cd7d658e  rust-cbindgen.tar.gz
diff --git a/thunderbird.spec b/thunderbird.spec
index 2438335..5036b9e 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -1,4 +1,4 @@
-%define anolis_release .0.1
+%define anolis_release .0.2
 # Set for local builds only
 %global disable_toolsets  0
 
@@ -96,7 +96,7 @@ end}
 %endif
 %global use_rustts        1
 %global dts_version       10
-%global rust_version      1.62
+# %global rust_version      1.62
 %if 0%{?rhel} >= 8
   %global use_rustts      0
 %endif
@@ -197,7 +197,7 @@ Source35:       google-loc-api-key
 Source403:      nss-3.79.0-6.el8_1.src.rpm
 Source401:      nss-setup-flags-env.inc
 Source402:      nspr-4.34.0-3.el8_1.src.rpm
-
+Source404:      rust-cbindgen.tar.gz
 # Build patches
 Patch3:         mozilla-build-arm.patch
 Patch25:        rhbz-1219542-s390-build.patch
@@ -315,7 +315,7 @@ BuildRequires:  rustfmt >= %{rust_version}
 %endif
 
 %if 0%{?use_rustts}
-BuildRequires:  rust-toolset-%{rust_version}
+# BuildRequires:  rust-toolset-%{rust_version}
 %endif
 
 %if 0%{?use_llvmts}
@@ -803,8 +803,23 @@ which node
 mkdir -p my_rust_vendor
 cd my_rust_vendor
 %{__tar} xf %{SOURCE2}
-mkdir -p .cargo
-cat > .cargo/config <<EOL
+cd ..
+mkdir rust-cbindgen
+cd rust-cbindgen
+%{__tar} xf %{SOURCE404}
+mkdir -p %{_buildrootdir}/cargo
+export CACHE_DIR=%{_buildrootdir}/cargo
+CARGO_HOME=$CACHE_DIR RUSTUP_HOME=$CACHE_DIR 
+%ifarch aarch64
+cp -r rust-cbindgen/rust-cbindgen-aarch64/* $CACHE_DIR
+%endif
+%ifarch x86_64
+cp -r rust-cbindgen/rust-cbindgen-x86_64/* $CACHE_DIR
+%endif
+export PATH=$CACHE_DIR/bin/:$PATH
+export LD_LIBRARY_PATH=$CACHE_DIR/lib:$LD_LIBRARY_PATH
+rustc --version
+cat > %{_buildrootdir}/cargo/config <<EOL
 [source.crates-io]
 replace-with = "vendored-sources"
 
@@ -816,8 +831,9 @@ EOL
 #export RUSTFLAGS="-Cdebuginfo=0 -Clinker=/opt/rh/gcc-toolset-12/root/usr/bin/gcc"
 %endif
 
-env CARGO_HOME=.cargo cargo install cbindgen
-export PATH=`pwd`/.cargo/bin:$PATH
+
+# env CARGO_HOME=.cargo cargo install cbindgen
+# export PATH=`pwd`/.cargo/bin:$PATH
 cd -
 %endif
 
@@ -1199,6 +1215,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Fri Feb 10 2023 hanshuang <hanshuang@uniontech.com> - 102.3.0-3.0.2
+- fix an7 compile problem 
+
 * Tue Oct 18 2022 Liwei Ge <geliwei@openanolis.org> - 102.3.0-3.0.1
 - Rebrand to Anolis 
 - Cherry-pick [f298858] 
-- 
Gitee