Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c309857b68d2e88a2ad439a14c867b737ebd8a53)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c309857b68d2e88a2ad439a14c867b737ebd8a53)
  • Date: Mon, 19 Aug 2019 23:42:23 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

devel/rust/BUILD | 3 +++
devel/rust/HISTORY | 3 +++
devel/rust/PRE_BUILD | 4 ++++
3 files changed, 10 insertions(+)

New commits:
commit c309857b68d2e88a2ad439a14c867b737ebd8a53
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

rust: Fix build against musl

diff --git a/devel/rust/BUILD b/devel/rust/BUILD
index cad4a52..35b90a3 100755
--- a/devel/rust/BUILD
+++ b/devel/rust/BUILD
@@ -22,6 +22,9 @@ fi &&
--enable-llvm-link-shared \
$OPTS &&

+# static doesn't work
+sed -i '/^#crt-static *= *false/s/#//' config.toml &&
+
sed -i "/BOOTSTRAP.*doc/d" Makefile &&

make
diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index 42aa5c0..811dcf4 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,3 +1,6 @@
+2019-08-19 Ismael Luceno <ismael AT iodev.co.uk>
+ * BUILD, PRE_BUILD: Fixed build against musl
+
2019-08-15 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.37.0, CARGO_VERSION=0.38.0

diff --git a/devel/rust/PRE_BUILD b/devel/rust/PRE_BUILD
index 8d1e5ba..0f0c4a0 100755
--- a/devel/rust/PRE_BUILD
+++ b/devel/rust/PRE_BUILD
@@ -9,6 +9,10 @@ if ! spell_ok "$SPELL"; then
unpack_file 5
fi &&

+# produce dynamic binaries by default on musl, like on glibc
+sedit '/^ *base[.]crt_static_default *=/s/true/false/' \
+ src/librustc_target/spec/linux_musl_base.rs &&
+
# avoid rebuilding llvm
rm -r src/llvm-project &&




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (c309857b68d2e88a2ad439a14c867b737ebd8a53), Ismael Luceno, 08/19/2019

Archive powered by MHonArc 2.6.24.

Top of Page