Skip to Content.
Sympa Menu

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

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 (98152aa804df7d74f38d4535509c0985cca5d91c)
  • Date: Wed, 21 Aug 2019 09:09:59 +0000

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

devel/rust/HISTORY | 2 ++
devel/rust/PRE_BUILD | 6 ++++++
devel/rust/patches/0001-libressl-2.9.x.patch | 11 +++++++++++
3 files changed, 19 insertions(+)

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

rust: Fix build against libressl 2.9.x

diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index 3df4163..39f234f 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -2,6 +2,8 @@
* DETAILS: PATCHLEVEL++
* BUILD: enable extended build (cargo and others)
* CONFLICTS: remove conflict with itself
+ * PRE_BUILD, patches/0001-libressl-2.9.x.patch: Fixed build against
+ libressl 2.9.x

2019-08-19 Ismael Luceno <ismael AT iodev.co.uk>
* BUILD, PRE_BUILD: Fixed build against musl
diff --git a/devel/rust/PRE_BUILD b/devel/rust/PRE_BUILD
index 0f0c4a0..9245a67 100755
--- a/devel/rust/PRE_BUILD
+++ b/devel/rust/PRE_BUILD
@@ -2,6 +2,12 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
apply_patch_dir patches &&

+# remove checksums to avoid failure with patched sources
+for i in openssl-sys; do
+ sedit 's/"files":{[^}]*}/"files":{}/' vendor/"$i"/.cargo-checksum.json ||
+ break
+done &&
+
# Bootstrapping
if ! spell_ok "$SPELL"; then
unpack_file 3 &&
diff --git a/devel/rust/patches/0001-libressl-2.9.x.patch
b/devel/rust/patches/0001-libressl-2.9.x.patch
new file mode 100644
index 0000000..978613d
--- /dev/null
+++ b/devel/rust/patches/0001-libressl-2.9.x.patch
@@ -0,0 +1,11 @@
+Allow to build against libressl 2.9.x
+
+--- a/vendor/openssl-sys/build/main.rs
++++ b/vendor/openssl-sys/build/main.rs
+@@ -199,6 +199,7 @@ See rust-openssl README for more information:
+ (8, 1) => ('8', '1'),
+ (8, _) => ('8', 'x'),
+ (9, 0) => ('9', '0'),
++ (9, _) => ('9', 'x'),
+ _ => version_error(),
+ };



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

Archive powered by MHonArc 2.6.24.

Top of Page