Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d9092d004cbdf8172779809fc15fd3c0c9d0261c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d9092d004cbdf8172779809fc15fd3c0c9d0261c)
  • Date: Sat, 11 Mar 2023 22:00:12 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

devel/rust/BUILD | 19 +++++++++++-------
devel/rust/HISTORY | 7 ++++++
devel/rust/INSTALL | 8 ++++++-
devel/rust/patches/0011-llvm-tools-install.patch | 24
+++++++++++++++++++++++
4 files changed, 50 insertions(+), 8 deletions(-)

New commits:
commit d9092d004cbdf8172779809fc15fd3c0c9d0261c
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

devel/rust: fixed installation errors regarding llvm and libressl

diff --git a/devel/rust/BUILD b/devel/rust/BUILD
index 5b1d7b5..f094ee2 100755
--- a/devel/rust/BUILD
+++ b/devel/rust/BUILD
@@ -38,20 +38,25 @@ message "${MESSAGE_COLOR}OPTS=$OPTS${DEFAULT_COLOR}" &&
--enable-missing-tools \
--disable-docs \
--enable-llvm-link-shared \
- --llvm-root=$INSTALL_ROOT/usr --disable-llvm-version-check
--disable-codegen-tests \
+ --llvm-root=$INSTALL_ROOT/usr \
+ --disable-llvm-version-check \
+ --disable-codegen-tests \
$OPTS &&

-# static doesn't work
-sed -i '/^#crt-static/acrt-static = false' config.toml &&
-
-sed -i "/BOOTSTRAP.*doc/d" Makefile &&
+# various switches to disable static build, downloading and using llvm
+# toolchain from rust CI and to set user profile
+sed -e '/^#crt-static/acrt-static = false' \
+ -e '/^#download-ci-llvm/adownload-ci-llvm = false' \
+ -e '/^#llvm-tools/allvm-tools = false' \
+ -e '/^#profile /aprofile = "user"' -i config.toml &&

export CARGO_HOME="$SOURCE_DIRECTORY/cargo_home" &&

-default_build_make &&
+python3 ./x.py build --config="${SOURCE_DIRECTORY}/config.toml"
-j"${MAKE_NJOBS:-1}" &&

# fake install
if spell_ok "${SPELL}"; then
mkdir -p "${SOURCE_DIRECTORY}/INSTALL_ROOT" &&
- make DESTDIR="${SOURCE_DIRECTORY}/INSTALL_ROOT" install
+ DESTDIR="${SOURCE_DIRECTORY}/INSTALL_ROOT" python3 ./x.py install \
+ --config="${SOURCE_DIRECTORY}/config.toml" -j"${MAKE_NJOBS:-1}"
fi
diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index 6b1aee9..80a51b3 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,3 +1,10 @@
+2023-03-11 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, INSTALL: switched to using ./x.py instead of make, added
more sedits
+ for config.toml regarding llvm and profile, copied C(XX)FLAGS to
fix error
+ in libssh2 during installation stage, reformatting++
+ * patches/0011-llvm-tools-install.patch: added to fix error of not
finding
+ llvm tools during installation stage
+
2023-03-09 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.68.0
* BUILD: explicitly specify rust channel, reformatted
diff --git a/devel/rust/INSTALL b/devel/rust/INSTALL
index 63ccc96..3890aa6 100755
--- a/devel/rust/INSTALL
+++ b/devel/rust/INSTALL
@@ -3,6 +3,12 @@ if test -d "${SOURCE_DIRECTORY}/INSTALL_ROOT"; then
find . | cpio --pass-through --make-directories --verbose --unconditional \
"${INSTALL_ROOT}/"
else
+ # for libressl >= 3.5.x
+ CFLAGS+=" -DHAVE_OPAQUE_STRUCTS=1" &&
+ CXXFLAGS+=" -DHAVE_OPAQUE_STRUCTS=1" &&
+
+ export CFLAGS CXXFLAGS &&
+
export CARGO_HOME="$SOURCE_DIRECTORY/cargo_home" &&
- default_install
+ DESTDIR="${INSTALL_ROOT}/" python3 ./x.py install
--config="${SOURCE_DIRECTORY}/config.toml" -j"${MAKE_NJOBS:-1}"
fi
diff --git a/devel/rust/patches/0011-llvm-tools-install.patch
b/devel/rust/patches/0011-llvm-tools-install.patch
new file mode 100644
index 0000000..cf689c2
--- /dev/null
+++ b/devel/rust/patches/0011-llvm-tools-install.patch
@@ -0,0 +1,24 @@
+diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
+index 1815a09..150f0a7 100644
+--- a/src/bootstrap/install.rs
++++ b/src/bootstrap/install.rs
+@@ -210,10 +210,15 @@ install!((self, builder, _config),
+ }
+ };
+ LlvmTools, alias = "llvm-tools", Self::should_build(_config),
only_hosts: true, {
+- let tarball = builder
+- .ensure(dist::LlvmTools { target: self.target })
+- .expect("missing llvm-tools");
+- install_sh(builder, "llvm-tools", self.compiler.stage,
Some(self.target), &tarball);
++ if let Some(tarball) = builder.ensure(dist::LlvmTools {
++ target: self.target
++ }) {
++ install_sh(builder, "llvm-tools", self.compiler.stage,
Some(self.target), &tarball);
++ } else {
++ builder.info(
++ &format!("skipping Install LlvmTools stage{} ({})",
self.compiler.stage, self.target),
++ );
++ }
+ };
+ Rustfmt, alias = "rustfmt", Self::should_build(_config), only_hosts:
true, {
+ if let Some(tarball) = builder.ensure(dist::Rustfmt {



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d9092d004cbdf8172779809fc15fd3c0c9d0261c), Pavel Vinogradov, 03/11/2023

Archive powered by MHonArc 2.6.24.

Top of Page